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

nautobot/core/views/mixins.py

@@ -604,7 +604,7 @@ class ObjectListViewMixin(NautobotViewSetMixin, mixins.ListModelMixin):
     filterset_class = None
     filterset_form_class = None
     non_filter_params = (
-        "export",  # trigger for CSV/export-template/YAML export
+        "export",  # trigger for CSV/export-template/YAML export # 3.0 TODO: remove, irrelevant after #4746
         "page",  # used by django-tables2.RequestConfig
         "per_page",  # used by get_paginate_count
         "sort",  # table sorting
@@ -626,6 +626,7 @@ class ObjectListViewMixin(NautobotViewSetMixin, mixins.ListModelMixin):
                 queryset = queryset.none()
         return queryset
 
+    # 3.0 TODO: remove, irrelevant after #4746
     def check_for_export(self, request, model, content_type):
         # Check for export template rendering
         queryset = self.filter_queryset(self.get_queryset())
@@ -652,6 +653,7 @@ class ObjectListViewMixin(NautobotViewSetMixin, mixins.ListModelMixin):
 
         return None
 
+    # 3.0 TODO: remove, irrelevant after #4746
     def queryset_to_yaml(self):
         """
         Export the queryset of objects as concatenated YAML documents.
@@ -666,7 +668,7 @@ class ObjectListViewMixin(NautobotViewSetMixin, mixins.ListModelMixin):
         List the model instances.
         """
         context = {"use_new_ui": True}
-        if "export" in request.GET:
+        if "export" in request.GET:  # 3.0 TODO: remove, irrelevant after #4746
             queryset = self.get_queryset()
             model = queryset.model
             content_type = ContentType.objects.get_for_model(model)

nautobot/core/views/renderers.py

@@ -14,6 +14,7 @@ from nautobot.core.forms import (
 from nautobot.core.forms.forms import DynamicFilterFormSet
 from nautobot.core.templatetags.helpers import bettertitle, validated_viewname
 from nautobot.core.utils.config import get_settings_or_config
+from nautobot.core.utils.lookup import get_created_and_last_updated_usernames_for_model
 from nautobot.core.utils.permissions import get_permission_for_model
 from nautobot.core.utils.requests import (
     convert_querydict_to_factory_formset_acceptable_querydict,
@@ -229,6 +230,10 @@ class NautobotHTMLRenderer(renderers.BrowsableAPIRenderer):
             "verbose_name_plural": queryset.model._meta.verbose_name_plural,
         }
         if view.action == "retrieve":
+            created_by, last_updated_by = get_created_and_last_updated_usernames_for_model(instance)
+
+            context["created_by"] = created_by
+            context["last_updated_by"] = last_updated_by
             context.update(view.get_extra_context(request, instance))
         else:
             if view.action == "list":

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/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. |

nautobot/dcim/tests/test_api.py

@@ -1546,7 +1546,7 @@ class InterfaceTest(Mixins.BasePortTestMixin):
             ),
         )
 
-        vlan_group = VLANGroup.objects.first()
+        vlan_group = VLANGroup.objects.create(name="Test VLANGroup 1")
         vlan_status = Status.objects.get_for_model(VLAN).first()
         cls.vlans = (
             VLAN.objects.create(name="VLAN 1", vid=1, status=vlan_status, vlan_group=vlan_group),

nautobot/dcim/tests/test_filters.py

@@ -137,12 +137,13 @@ def common_test_data(cls):
     CircuitTermination.objects.create(circuit=circuit, location=loc0, term_side="A")
     CircuitTermination.objects.create(circuit=circuit, location=loc1, term_side="Z")
 
-    manufacturers = list(Manufacturer.objects.all()[:3])
+    manufacturers = list(
+        Manufacturer.objects.filter(device_types__isnull=False, platforms__isnull=False).distinct()[:3]
+    )
     cls.manufacturers = manufacturers
 
-    platforms = Platform.objects.all()[:3]
+    platforms = Platform.objects.filter(manufacturer__in=manufacturers)[:3]
     for num, platform in enumerate(platforms):
-        platform.manufacturer = manufacturers[num]
         platform.napalm_driver = f"driver-{num}"
         platform.napalm_args = ["--test", f"--arg{num}"]
         platform.network_driver = f"driver_{num}"
@@ -651,6 +652,7 @@ class LocationFilterSetTestCase(FilterTestCases.NameOnlyFilterTestCase, FilterTe
         ("racks", "racks__id"),
         ("racks", "racks__name"),
         ("shipping_address",),
+        ("status", "status__id"),
         ("status", "status__name"),
         ("time_zone",),
         ("vlan_groups", "vlan_groups__id"),
@@ -765,7 +767,9 @@ class RackTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyFilter
         ("rack_group", "rack_group__name"),
         ("rack_reservations", "rack_reservations__id"),
         ("role", "role__name"),
+        ("role", "role__id"),
         ("serial",),
+        ("status", "status__id"),
         ("status", "status__name"),
         ("type",),
         ("u_height",),
@@ -1331,6 +1335,7 @@ class DeviceTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyFilt
         ("role", "role__name"),
         ("secrets_group", "secrets_group__id"),
         ("secrets_group", "secrets_group__name"),
+        ("status", "status__id"),
         ("status", "status__name"),
         ("vc_position",),
         ("vc_priority",),
@@ -1824,6 +1829,7 @@ class InterfaceTestCase(FilterTestCases.FilterTestCase):
         ("name",),
         ("parent_interface", "parent_interface__id"),
         ("parent_interface", "parent_interface__name"),
+        ("status", "status__id"),
         ("status", "status__name"),
         ("type",),
         ("tagged_vlans", "tagged_vlans__id"),
@@ -2579,6 +2585,7 @@ class CableTestCase(FilterTestCases.FilterTestCase):
         ("color",),
         ("label",),
         ("length",),
+        ("status", "status__id"),
         ("status", "status__name"),
         ("termination_a_id",),
         ("termination_b_id",),
@@ -2869,6 +2876,7 @@ class PowerFeedTestCase(FilterTestCases.FilterTestCase):
         ("power_panel", "power_panel__name"),
         ("rack", "rack__id"),
         ("rack", "rack__name"),
+        ("status", "status__id"),
         ("status", "status__name"),
         ("voltage",),
     ]

nautobot/extras/admin.py

@@ -31,7 +31,7 @@ class FileProxyForm(forms.ModelForm):
 @admin.register(FileProxy)
 class FileProxyAdmin(NautobotModelAdmin):
     form = FileProxyForm
-    list_display = ["name", "uploaded_at"]
+    list_display = ["name", "file", "uploaded_at"]
     list_filter = ["uploaded_at"]