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

nautobot/core/views/utils.py

@@ -3,7 +3,7 @@ import datetime
 from django.contrib import messages
 from django.core.exceptions import FieldError
 from django.db.models import ForeignKey
-from django.utils.html import escape
+from django.utils.html import format_html, format_html_join
 from django.utils.safestring import mark_safe
 
 from rest_framework import serializers
@@ -114,13 +114,13 @@ def get_csv_form_fields_from_serializer_class(serializer_class):
                     "help_text": cf_form_field.help_text,
                 }
                 if cf.type == CustomFieldTypeChoices.TYPE_BOOLEAN:
-                    field_info["format"] = mark_safe("<code>true</code> or <code>false</code>")
+                    field_info["format"] = mark_safe("<code>true</code> or <code>false</code>")  # noqa: S308
                 elif cf.type == CustomFieldTypeChoices.TYPE_DATE:
-                    field_info["format"] = mark_safe("<code>YYYY-MM-DD</code>")
+                    field_info["format"] = mark_safe("<code>YYYY-MM-DD</code>")  # noqa: S308
                 elif cf.type == CustomFieldTypeChoices.TYPE_SELECT:
                     field_info["choices"] = {cfc.value: cfc.value for cfc in cf.custom_field_choices.all()}
                 elif cf.type == CustomFieldTypeChoices.TYPE_MULTISELECT:
-                    field_info["format"] = mark_safe('<code>"value,value"</code>')
+                    field_info["format"] = mark_safe('<code>"value,value"</code>')  # noqa: S308
                     field_info["choices"] = {cfc.value: cfc.value for cfc in cf.custom_field_choices.all()}
                 fields.append(field_info)
             continue
@@ -132,27 +132,27 @@ def get_csv_form_fields_from_serializer_class(serializer_class):
             "help_text": field.help_text,
         }
         if isinstance(field, serializers.BooleanField):
-            field_info["format"] = mark_safe("<code>true</code> or <code>false</code>")
+            field_info["format"] = mark_safe("<code>true</code> or <code>false</code>")  # noqa: S308
         elif isinstance(field, serializers.DateField):
-            field_info["format"] = mark_safe("<code>YYYY-MM-DD</code>")
+            field_info["format"] = mark_safe("<code>YYYY-MM-DD</code>")  # noqa: S308
         elif isinstance(field, TimeZoneSerializerField):
-            field_info["format"] = mark_safe(
+            field_info["format"] = mark_safe(  # noqa: S308
                 '<a href="https://en.wikipedia.org/wiki/List_of_tz_database_time_zones">available options</a>'
             )
         elif isinstance(field, serializers.ManyRelatedField):
             if field.field_name == "tags":
-                field_info["format"] = mark_safe('<code>"name,name"</code> or <code>"UUID,UUID"</code>')
+                field_info["format"] = mark_safe('<code>"name,name"</code> or <code>"UUID,UUID"</code>')  # noqa: S308
             elif isinstance(field.child_relation, ContentTypeField):
-                field_info["format"] = mark_safe('<code>"app_label.model,app_label.model"</code>')
+                field_info["format"] = mark_safe('<code>"app_label.model,app_label.model"</code>')  # noqa: S308
             else:
-                field_info["format"] = mark_safe('<code>"UUID,UUID"</code>')
+                field_info["format"] = mark_safe('<code>"UUID,UUID"</code>')  # noqa: S308
         elif isinstance(field, serializers.RelatedField):
             if isinstance(field, ContentTypeField):
-                field_info["format"] = mark_safe("<code>app_label.model</code>")
+                field_info["format"] = mark_safe("<code>app_label.model</code>")  # noqa: S308
             else:
-                field_info["format"] = mark_safe("<code>UUID</code>")
+                field_info["format"] = mark_safe("<code>UUID</code>")  # noqa: S308
         elif isinstance(field, (serializers.ListField, serializers.MultipleChoiceField)):
-            field_info["format"] = mark_safe('<code>"value,value"</code>')
+            field_info["format"] = mark_safe('<code>"value,value"</code>')  # noqa: S308
         elif isinstance(field, (serializers.DictField, serializers.JSONField)):
             pass  # Not trivial to specify a format as it could be a JSON dict or a comma-separated string
 
@@ -173,21 +173,20 @@ def handle_protectederror(obj_list, request, e):
     """
     protected_objects = list(e.protected_objects)
     protected_count = len(protected_objects) if len(protected_objects) <= 50 else "More than 50"
-    err_message = (
-        f"Unable to delete <strong>{', '.join(str(obj) for obj in obj_list)}</strong>. "
-        f"{protected_count} dependent objects were found: "
+    err_message = format_html(
+        "Unable to delete <strong>{}</strong>. {} dependent objects were found: ",
+        ", ".join(str(obj) for obj in obj_list),
+        protected_count,
     )
 
     # Append dependent objects to error message
-    dependent_objects = []
-    for dependent in protected_objects[:50]:
-        if hasattr(dependent, "get_absolute_url"):
-            dependent_objects.append(f'<a href="{dependent.get_absolute_url()}">{escape(dependent)}</a>')
-        else:
-            dependent_objects.append(str(dependent))
-    err_message += ", ".join(dependent_objects)
+    err_message += format_html_join(
+        ", ",
+        '<a href="{}">{}</a>',
+        ((dependent.get_absolute_url(), dependent) for dependent in protected_objects[:50]),
+    )
 
-    messages.error(request, mark_safe(err_message))
+    messages.error(request, err_message)
 
 
 def prepare_cloned_fields(instance):

nautobot/dcim/api/serializers.py

@@ -275,9 +275,9 @@ class RackSerializer(
         model = Rack
         fields = "__all__"
         list_display_fields = ["name", "location", "rack_group", "status", "facility_id", "tenant", "role", "u_height"]
-        # Omit the UniqueTogetherValidator that would be automatically added to validate (rack_group, facility_id).
-        # This prevents facility_id from being interpreted as a required field.
-        validators = [UniqueTogetherValidator(queryset=Rack.objects.all(), fields=("rack_group", "name"))]
+        # Omit the UniqueTogetherValidators that would be automatically added to validate (rack_group, facility_id) and (rack_group, name).
+        # This prevents facility_id and rack_group from being interpreted as required fields.
+        validators = []
         detail_view_config = {
             "layout": [
                 {
@@ -294,8 +294,12 @@ class RackSerializer(
         }
 
     def validate(self, data):
+        # Validate uniqueness of (rack_group, name) since we omitted the automatically-created validator above.
+        if data.get("rack_group", None):
+            validator = UniqueTogetherValidator(queryset=Rack.objects.all(), fields=("rack_group", "name"))
+            validator(data, self)
         # Validate uniqueness of (rack_group, facility_id) since we omitted the automatically-created validator above.
-        if data.get("facility_id", None):
+        if data.get("facility_id", None) and data.get("rack_group", None):
             validator = UniqueTogetherValidator(queryset=Rack.objects.all(), fields=("rack_group", "facility_id"))
             validator(data, self)
 

nautobot/dcim/models/device_components.py

@@ -850,6 +850,7 @@ class InterfaceRedundancyGroup(PrimaryModel):  # pylint: disable=too-many-ancest
         return instance.delete()
 
 
+@extras_features("graphql")
 class InterfaceRedundancyGroupAssociation(BaseModel, ChangeLoggedModel):
     """Intermediary model for associating Interface(s) to InterfaceRedundancyGroup(s)."""
 

nautobot/dcim/models/devices.py

@@ -8,10 +8,9 @@ from django.core.serializers.json import DjangoJSONEncoder
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from django.db.models import F, ProtectedError, Q
-from django.utils.functional import cached_property
 from django.urls import reverse
-from django.utils.functional import classproperty
-from django.utils.safestring import mark_safe
+from django.utils.functional import cached_property, classproperty
+from django.utils.html import format_html
 
 from nautobot.core.models import BaseManager
 from nautobot.core.models.fields import NaturalOrderingField
@@ -257,9 +256,11 @@ class DeviceType(PrimaryModel):
                 url = f"{reverse('dcim:device_list')}?manufacturer={self.manufacturer_id}&device_type={self.pk}"
                 raise ValidationError(
                     {
-                        "u_height": mark_safe(
-                            f'Unable to set 0U height: Found <a href="{url}">{racked_instance_count} instances</a> already '
-                            f"mounted within racks."
+                        "u_height": format_html(
+                            "Unable to set 0U height: "
+                            'Found <a href="{}">{} instances</a> already mounted within racks.',
+                            url,
+                            racked_instance_count,
                         )
                     }
                 )

nautobot/dcim/navigation.py

@@ -5,7 +5,6 @@ from nautobot.core.apps import (
     NavMenuAddButton,
     NavMenuGroup,
     NavMenuItem,
-    NavMenuImportButton,
     NavMenuTab,
 )
 
@@ -33,12 +32,6 @@ menu_items = (
                                     "dcim.add_locationtype",
                                 ],
                             ),
-                            NavMenuImportButton(
-                                link="dcim:locationtype_import",
-                                permissions=[
-                                    "dcim.add_locationtype",
-                                ],
-                            ),
                         ),
                     ),
                     NavMenuItem(
@@ -55,12 +48,6 @@ menu_items = (
                                     "dcim.add_location",
                                 ],
                             ),
-                            NavMenuImportButton(
-                                link="dcim:location_import",
-                                permissions=[
-                                    "dcim.add_location",
-                                ],
-                            ),
                         ),
                     ),
                 ),
@@ -83,12 +70,6 @@ menu_items = (
                                     "dcim.add_rack",
                                 ],
                             ),
-                            NavMenuImportButton(
-                                link="dcim:rack_import",
-                                permissions=[
-                                    "dcim.add_rack",
-                                ],
-                            ),
                         ),
                     ),
                     NavMenuItem(
@@ -105,12 +86,6 @@ menu_items = (
                                     "dcim.add_rackgroup",
                                 ],
                             ),
-                            NavMenuImportButton(
-                                link="dcim:rackgroup_import",
-                                permissions=[
-                                    "dcim.add_rackgroup",
-                                ],
-                            ),
                         ),
                     ),
                     NavMenuItem(
@@ -127,12 +102,6 @@ menu_items = (
                                     "dcim.add_rackreservation",
                                 ],
                             ),
-                            NavMenuImportButton(
-                                link="dcim:rackreservation_import",
-                                permissions=[
-                                    "dcim.add_rackreservation",
-                                ],
-                            ),
                         ),
                     ),
                     NavMenuItem(
@@ -170,12 +139,6 @@ menu_items = (
                                     "dcim.add_device",
                                 ],
                             ),
-                            NavMenuImportButton(
-                                link="dcim:device_import",
-                                permissions=[
-                                    "dcim.add_device",
-                                ],
-                            ),
                         ),
                     ),
                     NavMenuItem(
@@ -192,12 +155,6 @@ menu_items = (
                                     "dcim.add_platform",
                                 ],
                             ),
-                            NavMenuImportButton(
-                                link="dcim:platform_import",
-                                permissions=[
-                                    "dcim.add_platform",
-                                ],
-                            ),
                         ),
                     ),
                     NavMenuItem(
@@ -214,12 +171,6 @@ menu_items = (
                                     "dcim.add_virtualchassis",
                                 ],
                             ),
-                            NavMenuImportButton(
-                                link="dcim:virtualchassis_import",
-                                permissions=[
-                                    "dcim.add_virtualchassis",
-                                ],
-                            ),
                         ),
                     ),
                     NavMenuItem(
@@ -236,12 +187,6 @@ menu_items = (
                                     "dcim.add_deviceredundancygroup",
                                 ],
                             ),
-                            NavMenuImportButton(
-                                link="dcim:deviceredundancygroup_import",
-                                permissions=[
-                                    "dcim.add_deviceredundancygroup",
-                                ],
-                            ),
                         ),
                     ),
                     NavMenuItem(
@@ -258,12 +203,6 @@ menu_items = (
                                     "dcim.add_interfaceredundancygroup",
                                 ],
                             ),
-                            NavMenuImportButton(
-                                link="dcim:interfaceredundancygroup_import",
-                                permissions=[
-                                    "dcim.add_interfaceredundancygroup",
-                                ],
-                            ),
                         ),
                     ),
                 ),
@@ -286,12 +225,6 @@ menu_items = (
                                     "dcim.add_devicetype",
                                 ],
                             ),
-                            NavMenuImportButton(
-                                link="dcim:devicetype_import",
-                                permissions=[
-                                    "dcim.add_devicetype",
-                                ],
-                            ),
                         ),
                     ),
                     NavMenuItem(
@@ -308,12 +241,6 @@ menu_items = (
                                     "dcim.add_manufacturer",
                                 ],
                             ),
-                            NavMenuImportButton(
-                                link="dcim:manufacturer_import",
-                                permissions=[
-                                    "dcim.add_manufacturer",
-                                ],
-                            ),
                         ),
                     ),
                 ),
@@ -329,14 +256,7 @@ menu_items = (
                         permissions=[
                             "dcim.view_cable",
                         ],
-                        buttons=(
-                            NavMenuImportButton(
-                                link="dcim:cable_import",
-                                permissions=[
-                                    "dcim.add_cable",
-                                ],
-                            ),
-                        ),
+                        buttons=(),
                     ),
                     NavMenuItem(
                         link="dcim:console_connections_list",
@@ -380,14 +300,7 @@ menu_items = (
                         permissions=[
                             "dcim.view_interface",
                         ],
-                        buttons=(
-                            NavMenuImportButton(
-                                link="dcim:interface_import",
-                                permissions=[
-                                    "dcim.add_interface",
-                                ],
-                            ),
-                        ),
+                        buttons=(),
                     ),
                     NavMenuItem(
                         link="dcim:frontport_list",
@@ -396,14 +309,7 @@ menu_items = (
                         permissions=[
                             "dcim.view_frontport",
                         ],
-                        buttons=(
-                            NavMenuImportButton(
-                                link="dcim:frontport_import",
-                                permissions=[
-                                    "dcim.add_frontport",
-                                ],
-                            ),
-                        ),
+                        buttons=(),
                     ),
                     NavMenuItem(
                         link="dcim:rearport_list",
@@ -412,14 +318,7 @@ menu_items = (
                         permissions=[
                             "dcim.view_rearport",
                         ],
-                        buttons=(
-                            NavMenuImportButton(
-                                link="dcim:rearport_import",
-                                permissions=[
-                                    "dcim.add_rearport",
-                                ],
-                            ),
-                        ),
+                        buttons=(),
                     ),
                     NavMenuItem(
                         link="dcim:consoleport_list",
@@ -428,14 +327,7 @@ menu_items = (
                         permissions=[
                             "dcim.view_consoleport",
                         ],
-                        buttons=(
-                            NavMenuImportButton(
-                                link="dcim:consoleport_import",
-                                permissions=[
-                                    "dcim.add_consoleport",
-                                ],
-                            ),
-                        ),
+                        buttons=(),
                     ),
                     NavMenuItem(
                         link="dcim:consoleserverport_list",
@@ -444,14 +336,7 @@ menu_items = (
                         permissions=[
                             "dcim.view_consoleserverport",
                         ],
-                        buttons=(
-                            NavMenuImportButton(
-                                link="dcim:consoleserverport_import",
-                                permissions=[
-                                    "dcim.add_consoleserverport",
-                                ],
-                            ),
-                        ),
+                        buttons=(),
                     ),
                     NavMenuItem(
                         link="dcim:powerport_list",
@@ -460,14 +345,7 @@ menu_items = (
                         permissions=[
                             "dcim.view_powerport",
                         ],
-                        buttons=(
-                            NavMenuImportButton(
-                                link="dcim:powerport_import",
-                                permissions=[
-                                    "dcim.add_powerport",
-                                ],
-                            ),
-                        ),
+                        buttons=(),
                     ),
                     NavMenuItem(
                         link="dcim:poweroutlet_list",
@@ -476,14 +354,7 @@ menu_items = (
                         permissions=[
                             "dcim.view_poweroutlet",
                         ],
-                        buttons=(
-                            NavMenuImportButton(
-                                link="dcim:poweroutlet_import",
-                                permissions=[
-                                    "dcim.add_poweroutlet",
-                                ],
-                            ),
-                        ),
+                        buttons=(),
                     ),
                     NavMenuItem(
                         link="dcim:devicebay_list",
@@ -492,14 +363,7 @@ menu_items = (
                         permissions=[
                             "dcim.view_devicebay",
                         ],
-                        buttons=(
-                            NavMenuImportButton(
-                                link="dcim:devicebay_import",
-                                permissions=[
-                                    "dcim.add_devicebay",
-                                ],
-                            ),
-                        ),
+                        buttons=(),
                     ),
                     NavMenuItem(
                         link="dcim:inventoryitem_list",
@@ -508,14 +372,7 @@ menu_items = (
                         permissions=[
                             "dcim.view_inventoryitem",
                         ],
-                        buttons=(
-                            NavMenuImportButton(
-                                link="dcim:inventoryitem_import",
-                                permissions=[
-                                    "dcim.add_inventoryitem",
-                                ],
-                            ),
-                        ),
+                        buttons=(),
                     ),
                 ),
             ),
@@ -542,12 +399,6 @@ menu_items = (
                                     "dcim.add_powerfeed",
                                 ],
                             ),
-                            NavMenuImportButton(
-                                link="dcim:powerfeed_import",
-                                permissions=[
-                                    "dcim.add_powerfeed",
-                                ],
-                            ),
                         ),
                     ),
                     NavMenuItem(
@@ -563,12 +414,6 @@ menu_items = (
                                     "dcim.add_powerpanel",
                                 ],
                             ),
-                            NavMenuImportButton(
-                                link="dcim:powerpanel_import",
-                                permissions=[
-                                    "dcim.add_powerpanel",
-                                ],
-                            ),
                         ),
                     ),
                 ),

nautobot/dcim/templates/dcim/location.html

@@ -173,7 +173,7 @@
         <div class="panel-heading">
             <strong>Stats</strong>
         </div>
-        <div class="row panel-body">
+        <div class="panel-body">
             <div class="col-md-4 text-center">
                 <h2><a href="{% url 'dcim:rack_list' %}?location={{ object.pk }}" class="btn {% if stats.rack_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.rack_count }}</a></h2>
                 <p>Racks</p>

nautobot/dcim/tests/features/locations.feature

@@ -0,0 +1,143 @@
+Feature: Locations
+  In order to represent the geographical structure of my organization's infrastructure,
+  As a Network Engineer
+  I want to record in Nautobot an appropriate set of LocationType and Location records.
+
+  Background:
+    Given I have appropriate Nautobot permissions:
+      | model             | permissions            |
+      | dcim.locationtype | add,change,delete,view |
+      | dcim.location     | add,change,delete,view |
+    And I am logged in to Nautobot
+
+  Scenario: Creating a hierarchy of LocationTypes
+    When I navigate to the "Add LocationType" view
+    And I make the following form entries:
+      | name              | nestable |
+      | Geographic Region | True     |
+    And I submit the form
+    Then a LocationType exists in Nautobot with the following properties:
+      | name              | parent | nestable |
+      | Geographic Region | None   | True     |
+    And Nautobot shows the "LocationType Detail" view for the LocationType with name "Geographic Region"
+
+    When I click the "Add child" button
+    Then Nautobot shows the "Add LocationType" view with the following presets:
+      | parent            |
+      | Geographic Region |
+    When I make the following form entries:
+      | name |
+      | City |
+    And I submit the form
+    Then a LocationType exists in Nautobot with the following properties:
+      | name | parent              | nestable |
+      | City | Geographic Region   | False    |
+    And Nautobot shows the "LocationType Detail" view for the LocationType with name "City"
+
+    When I click the "Add child" button
+    Then Nautobot shows the "Add LocationType" view with the following presets:
+      | parent |
+      | City   |
+    When I make the following form entries:
+      | name     | content_types |
+      | Building | [dcim.device] |
+    And I submit the form
+    Then a LocationType exists in Nautobot with the following properties:
+      | name     | parent | nestable | content_types |
+      | Building | City   | False    | [dcim.device] |
+    And Nautobot shows the "LocationType Detail" view for the LocationType with name "Building"
+
+  Scenario: Creating a hierarchy of Locations
+    Given that LocationType records exist with the following properties:
+      | name              | parent            | nestable |
+      | Geographic Region | None              | True     |
+      | City              | Geographic Region | False    |
+      | Building          | City              | False    |
+    When I navigate to the "Add Location" view
+    And I make the following form entries:
+      | name          | location_type     | status |
+      | United States | Geographic Region | Active |
+    And I submit the form
+    Then a Location exists in Nautobot with the following properties:
+      | name          | location_type     | parent | status |
+      | United States | Geographic Region | None   | Active |
+    And Nautobot shows the "Location Detail" view for the Location with name "United States"
+
+    When I click the "Add child" button
+    Then Nautobot shows the "Add Location" view with the following presets:
+      | parent        |
+      | United States |
+    When I make the following form entries:
+      | name           | location_type     | status | time_zone |
+      | North Carolina | Geographic Region | Active | America/New York |
+    And I submit the form
+    Then a Location exists in Nautobot with the following properties:
+      | name           | location_type     | parent        | status | time_zone        |
+      | North Carolina | Geographic Region | United States | Active | America/New York |
+    And Nautobot shows the "Location Detail" view for the Location with name "North Carolina"
+
+    When I click the "Add child" button
+    Then Nautobot shows the "Add Location" view with the following presets:
+      | parent         |
+      | North Carolina |
+    When I make the following form entries:
+      | name   | location_type | status  |
+      | Durham | City          | Planned |
+    And I submit the form
+    Then a Location exists in Nautobot with the following properties:
+      | name   | location_type | parent         | status  |
+      | Durham | City          | North Carolina | Planned |
+    And Nautobot shows the "Location Detail" view for the Location with name "Durham"
+
+    When I click the "Add child" button
+    Then Nautobot shows the "Add Location" view with the following presets:
+      | parent |
+      | Durham |
+    When I make the following form entries:
+      | name                       | location_type | status  | physical_address     |
+      | Durham Bulls Athletic Park | Building      | Planned | 409 Blackwell Street |
+    And I submit the form via the "Create and Add Another" button
+    Then a Location exists in Nautobot with the following properties:
+      | name                       | location_type | parent | status  | physical_address     |
+      | Durham Bulls Athletic Park | Building      | Durham | Planned | 409 Blackwell Street |
+    And Nautobot shows the "Add Location" view with the following presets:
+      | parent | location_type | status  |
+      | Durham | Building      | Planned |
+    When I make the following form entries:
+      | name                          |
+      | Durham Performing Arts Center |
+    And I submit the form
+    Then a Location exists in Nautobot with the following properties:
+      | name                          | location_type | parent | status  |
+      | Durham Performing Arts Center | Building      | Durham | Planned |
+    And Nautobot shows the "Location Detail" view for the Location with name "Durham Performing Arts Center"
+
+    When I click on the "Durham" link
+    Then Nautobot shows the "Location Detail" view for the Location with name "Durham"
+    And the table "Children" includes rows with the following properties:
+      | name                          | status  |
+      | Durham Bulls Athletic Park    | Planned |
+      | Durham Performing Arts Center | Planned |
+
+  Scenario Outline: Missing required fields for Location
+    Given that LocationType records exist with the following properties:
+      | name              | parent            | nestable |
+      | Geographic Region | None              | True     |
+      | City              | Geographic Region | False    |
+      | Building          | Building          | False    |
+    When I navigate to the "Add Location" view
+    And I make the following form entries:
+      | name   | location_type   | parent   | status   |
+      | <name> | <location_type> | <parent> | <status> |
+    And I submit the form
+    Then Nautobot shows the "Add Location" view with the following presets:
+      | name   | location_type   | parent   | status   |
+      | <name> | <location_type> | <parent> | <status> |
+    And the field "<required_field>" shows error message "<error_message>"
+
+    Scenarios:
+      | name          | location_type     | parent | status | required_field | error_message                      |
+      |               | Geographic Region | None   | Active | name           | Please fill out this field.        |
+      | United States | None              | None   | Active | location_type  | Please select an item in the list. |
+      | United States | Geographic Region | None   | None   | status         | Please select an item in the list. |
+      | Durham        | City              | None   | Active | parent         | A Location of type City must have a parent Location. |