nautobot 2.4.20__py3-none-any.whl → 2.4.21__py3-none-any.whl

nautobot/dcim/templates/dcim/location_retrieve.html

@@ -1,243 +1,2 @@
 {% extends 'generic/object_retrieve.html' %}
-{% load buttons %}
-{% load plugins %}
-{% load helpers %}
-{% load tz %}
-
-{% block content_left_page %}
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <strong>Location</strong>
-        </div>
-        <table class="table table-hover panel-body attr-table">
-            <tr>
-                <td>Location Type</td>
-                <td>{{ object.location_type|hyperlinked_object:"name" }}</td>
-            </tr>
-            <tr>
-                <td>Status</td>
-                <td>
-                    {{ object.status| hyperlinked_object_with_color }}
-                </td>
-            </tr>
-            <tr>
-                <td>Hierarchy</td>
-                <td>
-                    {% include 'dcim/inc/location_hierarchy.html' with location=object %}
-                </td>
-            </tr>
-            {% include 'inc/tenant_table_row.html' %}
-            <tr>
-                <td>Facility</td>
-                <td>{{ object.facility|placeholder }}</td>
-            </tr>
-            <tr>
-                <td>AS Number</td>
-                <td>{{ object.asn|placeholder }}</td>
-            </tr>
-            <tr>
-                <td>Time Zone</td>
-                <td>
-                    {% if object.time_zone %}
-                        {{ object.time_zone }} (UTC {{ object.time_zone|tzoffset }})<br />
-                        <small class="text-muted">Local time: {% timezone object.time_zone %}{% now "SHORT_DATETIME_FORMAT" %}{% endtimezone %}</small>
-                    {% else %}
-                        <span class="text-muted">&mdash;</span>
-                    {% endif %}
-                </td>
-            </tr>
-            <tr>
-                <td>Description</td>
-                <td>{{ object.description|placeholder }}</td>
-            </tr>
-            <tr>
-                <td>Children</td>
-                <td>
-                    {% if object.children.all %}
-                        <a href="{% url 'dcim:location_list' %}?parent={{ object.pk }}">{{ children_table.rows|length }}</a>
-                    {% else %}
-                        {{ None|placeholder }}
-                    {% endif %}
-                </td>
-            </tr>
-        </table>
-    </div>
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <strong>Geographical Info</strong>
-        </div>
-        <table class="table table-hover panel-body attr-table">
-            <tr>
-                <td>Physical Address</td>
-                <td>
-                    {% if object.physical_address %}
-                        <div class="pull-right noprint">
-                            <a href="https://maps.google.com/?q={{ object.physical_address|urlencode }}" target="_blank" class="btn btn-primary btn-xs">
-                                <i class="mdi mdi-map-marker"></i> Map it
-                            </a>
-                        </div>
-                        <span>{{ object.physical_address|linebreaksbr }}</span>
-                    {% else %}
-                        <span class="text-muted">&mdash;</span>
-                    {% endif %}
-                </td>
-            </tr>
-            <tr>
-                <td>Shipping Address</td>
-                <td>{{ object.shipping_address|linebreaksbr|placeholder }}</td>
-            </tr>
-            <tr>
-                <td>GPS Coordinates</td>
-                <td>
-                    {% if object.latitude and object.longitude %}
-                        <div class="pull-right noprint">
-                            <a href="https://maps.google.com/?q={{ object.latitude }},{{ object.longitude }}" target="_blank" class="btn btn-primary btn-xs">
-                                <i class="mdi mdi-map-marker"></i> Map it
-                            </a>
-                        </div>
-                        <span>{{ object.latitude }}, {{ object.longitude }}</span>
-                    {% else %}
-                        <span class="text-muted">&mdash;</span>
-                    {% endif %}
-                </td>
-            </tr>
-        </table>
-    </div>
-    {% if show_convert_to_contact_button %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Contact Info</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Contact Name</td>
-                    <td>{{ object.contact_name|placeholder }}</td>
-                </tr>
-                <tr>
-                    <td>Contact Phone</td>
-                    <td>{{ object.contact_phone|hyperlinked_phone_number }}</td>
-                </tr>
-                <tr>
-                    <td>Contact E-Mail</td>
-                    <td>{{ object.contact_email|hyperlinked_email }}</td>
-                </tr>
-            </table>
-            {% if request.user|has_perms:contact_association_permission %}
-                {% with request.path|add:"?tab=contacts"|urlencode as return_url %}
-                    <div class="panel-footer text-right noprint">
-                        <a href="{% url 'dcim:location_migrate_data_to_contact' pk=object.pk %}?return_url={{return_url}}" class="btn btn-primary btn-xs">
-                            <span class="mdi mdi-account-edit" aria-hidden="true"></span>
-                            Convert to contact/team record
-                        </a>
-                    </div>
-                {% endwith %}
-            {% endif %}
-        </div>
-    {% endif %}
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <strong>Comments</strong>
-        </div>
-        <div class="panel-body rendered-markdown">
-            {% if object.comments %}
-                {{ object.comments|render_markdown }}
-            {% else %}
-                <span class="text-muted">None</span>
-            {% endif %}
-        </div>
-    </div>
-{% endblock content_left_page %}
-
-{% block content_right_page %}
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <strong>Stats</strong>
-        </div>
-        <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>
-            </div>
-            <div class="col-md-4 text-center">
-                <h2><a href="{% url 'dcim:device_list' %}?location={{ object.pk }}" class="btn {% if stats.device_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.device_count }}</a></h2>
-                <p>Devices</p>
-            </div>
-            <div class="col-md-4 text-center">
-                <h2><a href="{% url 'ipam:prefix_list' %}?locations={{ object.pk }}" class="btn {% if stats.prefix_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.prefix_count }}</a></h2>
-                <p>Prefixes</p>
-            </div>
-            <div class="col-md-4 text-center">
-                <h2><a href="{% url 'ipam:vlan_list' %}?locations={{ object.pk }}" class="btn {% if stats.vlan_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.vlan_count }}</a></h2>
-                <p>VLANs</p>
-            </div>
-            <div class="col-md-4 text-center">
-                <h2><a href="{% url 'circuits:circuit_list' %}?location={{ object.pk }}" class="btn {% if stats.circuit_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.circuit_count }}</a></h2>
-                <p>Circuits</p>
-            </div>
-            <div class="col-md-4 text-center">
-                <h2><a href="{% url 'virtualization:virtualmachine_list' %}?location={{ object.pk }}" class="btn {% if stats.vm_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.vm_count }}</a></h2>
-                <p>Virtual Machines</p>
-            </div>
-        </div>
-    </div>
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <strong>Rack Groups</strong>
-        </div>
-        <table class="table table-hover panel-body">
-            {% for rg in rack_groups %}
-                <tr>
-                    <td style="padding-left: {{ rg.tree_depth }}8px"><i class="mdi mdi-folder-open"></i> <a href="{{ rg.get_absolute_url }}">{{ rg }}</a></td>
-                    <td>{{ rg.rack_count }}</td>
-                    <td class="text-right noprint">
-                        <a href="{% url 'dcim:rack_elevation_list' %}?rack_group={{ rg.pk }}" class="btn btn-xs btn-primary" title="View elevations">
-                            <i class="mdi mdi-server"></i>
-                        </a>
-                    </td>
-                </tr>
-            {% endfor %}
-            <tr>
-                <td><i class="mdi mdi-folder-open"></i> All racks</td>
-                <td>{{ stats.rack_count }}</td>
-                <td class="text-right noprint">
-                    <a href="{% url 'dcim:rack_elevation_list' %}?location={{ object.pk }}" class="btn btn-xs btn-primary" title="View elevations">
-                        <i class="mdi mdi-server"></i>
-                    </a>
-                </td>
-            </tr>
-        </table>
-    </div>
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <strong>Images</strong>
-        </div>
-        {% include 'inc/image_attachments.html' with images=object.images.all %}
-        {% if perms.extras.add_imageattachment %}
-            <div class="panel-footer text-right noprint">
-                <a href="{% url 'dcim:location_add_image' object_id=object.pk %}" class="btn btn-primary btn-xs">
-                    <span class="mdi mdi-plus-thick" aria-hidden="true"></span>
-                    Attach an image
-                </a>
-            </div>
-        {% endif %}
-    </div>
-{% endblock content_right_page %}
-
-{% block content_full_width_page %}
-    {% if object.children.all %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Children</strong>
-            </div>
-            {% include 'inc/table.html' with table=children_table %}
-            {% if perms.dcim.add_location %}
-                <div class="panel-footer text-right noprint">
-                    <a href="{% url 'dcim:location_add' %}?parent={{ object.pk }}" class="btn btn-xs btn-primary">
-                        <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add child
-                    </a>
-                </div>
-            {% endif %}
-        </div>
-        {% include 'inc/paginator.html' with paginator=children_table.paginator page=children_table.page %}
-    {% endif %}
-{% endblock content_full_width_page %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/dcim/templates/dcim/modulefamily_retrieve.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}

nautobot/dcim/templates/dcim/powerfeed.html

@@ -1,2 +1,2 @@
-{% extends 'dcim/powerfeed_retrieve.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/dcim/templates/dcim/powerpanel.html

@@ -1,2 +1,2 @@
-{% extends 'dcim/powerpanel_retrieve.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/dcim/templates/dcim/virtualchassis.html

@@ -1,2 +1,2 @@
-{% extends 'dcim/virtualchassis_retrieve.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/dcim/tests/test_models.py

@@ -2834,6 +2834,11 @@ class InterfaceTestCase(ModularDeviceComponentTestCaseMixin, ModelTestCases.Base
         self.assertEqual(count, 1)
         self.assertEqual(IPAddressToInterface.objects.filter(ip_address=ips[-1], interface=interface).count(), 1)
 
+        # add a single instance which is already there
+        count = interface.add_ip_addresses(ips[-1])
+        self.assertEqual(count, 0)
+        self.assertEqual(IPAddressToInterface.objects.filter(ip_address=ips[-1], interface=interface).count(), 1)
+
         # add multiple instances
         count = interface.add_ip_addresses(ips[:5])
         self.assertEqual(count, 5)
@@ -2841,6 +2846,20 @@ class InterfaceTestCase(ModularDeviceComponentTestCaseMixin, ModelTestCases.Base
         for ip in ips[:5]:
             self.assertEqual(IPAddressToInterface.objects.filter(ip_address=ip, interface=interface).count(), 1)
 
+        # add multiple instances all of which are already there
+        count = interface.add_ip_addresses(ips[:5])
+        self.assertEqual(count, 0)
+        self.assertEqual(IPAddressToInterface.objects.filter(interface=interface).count(), 6)
+        for ip in ips[:5]:
+            self.assertEqual(IPAddressToInterface.objects.filter(ip_address=ip, interface=interface).count(), 1)
+
+        # add multiple IPs some of which are there
+        count = interface.add_ip_addresses(ips[3:7])
+        self.assertEqual(count, 2)
+        self.assertEqual(IPAddressToInterface.objects.filter(interface=interface).count(), 8)
+        for ip in ips[3:7]:
+            self.assertEqual(IPAddressToInterface.objects.filter(ip_address=ip, interface=interface).count(), 1)
+
     def test_remove_ip_addresses(self):
         """Test the `remove_ip_addresses` helper method on `Interface`"""
         interface = Interface.objects.create(
@@ -2863,13 +2882,28 @@ class InterfaceTestCase(ModularDeviceComponentTestCaseMixin, ModelTestCases.Base
         self.assertEqual(count, 1)
         self.assertEqual(IPAddressToInterface.objects.filter(interface=interface).count(), 9)
 
+        # remove a single instance which has already been removed
+        count = interface.remove_ip_addresses(ips[-1])
+        self.assertEqual(count, 0)
+        self.assertEqual(IPAddressToInterface.objects.filter(interface=interface).count(), 9)
+
         # remove multiple instances
         count = interface.remove_ip_addresses(ips[:5])
         self.assertEqual(count, 5)
         self.assertEqual(IPAddressToInterface.objects.filter(interface=interface).count(), 4)
 
+        # remove multiple instances all which have already been removed
+        count = interface.remove_ip_addresses(ips[:5])
+        self.assertEqual(count, 0)
+        self.assertEqual(IPAddressToInterface.objects.filter(interface=interface).count(), 4)
+
+        # remove multiple instances some of which have already been removed
+        count = interface.remove_ip_addresses(ips[3:7])
+        self.assertEqual(count, 2)
+        self.assertEqual(IPAddressToInterface.objects.filter(interface=interface).count(), 2)
+
         count = interface.remove_ip_addresses(ips)
-        self.assertEqual(count, 4)
+        self.assertEqual(count, 2)
         self.assertEqual(IPAddressToInterface.objects.filter(interface=interface).count(), 0)
 
         # Test the pre_delete signal for IPAddressToInterface instances
@@ -2877,10 +2911,16 @@ class InterfaceTestCase(ModularDeviceComponentTestCaseMixin, ModelTestCases.Base
         self.device.primary_ip4 = interface.ip_addresses.all().filter(ip_version=4).first()
         self.device.primary_ip6 = interface.ip_addresses.all().filter(ip_version=6).first()
         self.device.save()
-        interface.remove_ip_addresses(self.device.primary_ip4)
+
+        count = interface.remove_ip_addresses(self.device.primary_ip4)
+        self.assertEqual(count, 1)
         self.device.refresh_from_db()
         self.assertEqual(self.device.primary_ip4, None)
-        interface.remove_ip_addresses(self.device.primary_ip6)
+        # NOTE: This effectively tests what happens when you pass remove_ip_addresses None; it
+        # NOTE: does not remove a v6 address, because there are no v6 IPs created in this test
+        # NOTE: class.
+        count = interface.remove_ip_addresses(self.device.primary_ip6)
+        self.assertEqual(count, 0)
         self.device.refresh_from_db()
         self.assertEqual(self.device.primary_ip6, None)
 

nautobot/dcim/tests/test_views.py

@@ -7,7 +7,6 @@ from django.contrib.auth import get_user_model
 from django.contrib.contenttypes.models import ContentType
 from django.db.models import Q
 from django.test import override_settings
-from django.test.client import RequestFactory
 from django.urls import reverse
 from django.utils.html import strip_spaces_between_tags
 from netaddr import EUI
@@ -109,7 +108,6 @@ from nautobot.dcim.models import (
 from nautobot.dcim.views import (
     ConsoleConnectionsListView,
     InterfaceConnectionsListView,
-    LocationUIViewSet,
     PowerConnectionsListView,
 )
 from nautobot.extras.choices import CustomFieldTypeChoices, RelationshipTypeChoices
@@ -211,8 +209,10 @@ class LocationTypeTestCase(ViewTestCases.OrganizationalObjectViewTestCase, ViewT
 
 class LocationTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     model = Location
-    # One query for the natural slug, one for `LocationViewSet.get_extra_context`
-    allowed_number_of_tree_queries_per_view_type = {"retrieve": 2}
+    # One query for the natural slug, one for `LocationViewSet.get_extra_context`, and additional for distinct (which may be fixable?)
+    # See: https://github.com/nautobot/nautobot/pull/7530#discussion_r2432836062
+    # and https://github.com/nautobot/nautobot/pull/7530#discussion_r2432620239 for additional context
+    allowed_number_of_tree_queries_per_view_type = {"retrieve": 3}
 
     @classmethod
     def setUpTestData(cls):
@@ -442,7 +442,6 @@ class LocationTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         self.assertEqual(location.contact_email, "")
 
     def test_get_extra_context(self):
-        view_set = LocationUIViewSet()
         child_1, child_2 = Location.objects.filter(name__startswith="Leaf ")
         parent_location = child_1.parent
         child_1.location_type.content_types.add(ContentType.objects.get_for_model(Prefix))
@@ -451,12 +450,24 @@ class LocationTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         prefix_2 = Prefix.objects.create(network="192.0.2.128", prefix_length=25, status=status)
         prefix_1.locations.set([child_1, child_2])
         prefix_2.locations.set([child_1, child_2])
-        request = RequestFactory().get(parent_location.get_absolute_url())
-        request.user = self.user
+
         self.add_permissions("dcim.view_location")
         self.add_permissions("ipam.view_prefix")
-        context = view_set.get_extra_context(request=request, instance=parent_location)
-        self.assertEqual(context["stats"]["prefix_count"], 2)
+
+        url = parent_location.get_absolute_url()
+        context = self.client.get(url).context
+        prefix_count = (
+            Prefix.objects.filter(location__in=parent_location.descendants(include_self=True)).distinct().count()
+        )
+
+        # Ensure that the context contains "stats" and the expected stat for prefix_list
+        self.assertIn("stats", context)
+        found = False
+        for stat in context["stats"].values():
+            if stat[0] == "ipam:prefix_list":
+                self.assertEqual(stat[1], prefix_count)
+                found = True
+        self.assertTrue(found, "ipam:prefix_list stat not found in context['stats']")
 
 
 class RackGroupTestCase(ViewTestCases.OrganizationalObjectViewTestCase, ViewTestCases.BulkEditObjectsViewTestCase):
@@ -2185,7 +2196,7 @@ class DeviceTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         )
         cls.custom_fields[0].content_types.set([ContentType.objects.get_for_model(Device)])
 
-        devices = (
+        cls.devices = (
             Device.objects.create(
                 name="Device 1",
                 location=locations[0],
@@ -2250,16 +2261,40 @@ class DeviceTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         intf_status = Status.objects.get_for_model(Interface).first()
         intf_role = Role.objects.get_for_model(Interface).first()
         cls.interfaces = (
-            Interface.objects.create(device=devices[0], name="Interface A1", status=intf_status, role=intf_role),
-            Interface.objects.create(device=devices[0], name="Interface A2", status=intf_status),
-            Interface.objects.create(device=devices[0], name="Interface A3", status=intf_status, role=intf_role),
+            Interface.objects.create(device=cls.devices[0], name="Interface A1", status=intf_status, role=intf_role),
+            Interface.objects.create(device=cls.devices[0], name="Interface A2", status=intf_status),
+            Interface.objects.create(device=cls.devices[0], name="Interface A3", status=intf_status, role=intf_role),
         )
 
-        for device, ipaddress in zip(devices, ipaddresses):
+        for device, ipaddress in zip(cls.devices, ipaddresses):
             RelationshipAssociation(
                 relationship=cls.relationships[0], source=device, destination=ipaddress
             ).validated_save()
 
+        powerports = (
+            PowerPort.objects.create(device=cls.devices[0], name="Power Port 1"),
+            PowerPort.objects.create(device=cls.devices[0], name="Power Port 2"),
+            PowerPort.objects.create(device=cls.devices[0], name="Power Port 3"),
+        )
+        PowerOutlet.objects.create(device=cls.devices[0], name="Power Outlet A")
+
+        powerpanel = PowerPanel.objects.create(location=locations[0], name="Power Panel 1")
+        pf_status = Status.objects.get_for_model(PowerFeed).first()
+        powerfeed = PowerFeed.objects.create(
+            power_panel=powerpanel,
+            name="Power Feed 1",
+            status=pf_status,
+            available_power=1000,
+            phase=PowerFeedPhaseChoices.PHASE_3PHASE,
+        )
+
+        status_connected = Status.objects.get(name="Connected")
+
+        Cable.objects.create(termination_a=powerports[0], termination_b=powerfeed, status=status_connected)
+
+        poweroutlet = PowerOutlet.objects.create(device=cls.devices[1], name="Power Outlet 1")
+        Cable.objects.create(termination_a=powerports[1], termination_b=poweroutlet, status=status_connected)
+
         cls.form_data = {
             "device_type": devicetypes[1].pk,
             "role": deviceroles[1].pk,
@@ -2407,11 +2442,7 @@ class DeviceTestCase(ViewTestCases.PrimaryObjectViewTestCase):
 
     @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
     def test_device_powerports(self):
-        device = Device.objects.first()
-
-        PowerPort.objects.create(device=device, name="Power Port 1")
-        PowerPort.objects.create(device=device, name="Power Port 2")
-        PowerPort.objects.create(device=device, name="Power Port 3")
+        device = self.devices[0]
 
         url = reverse("dcim:device_powerports", kwargs={"pk": device.pk})
         self.assertHttpStatus(self.client.get(url), 200)
@@ -4075,8 +4106,8 @@ class PowerConnectionsTestCase(ViewTestCases.ListObjectsViewTestCase):
         )
 
         poweroutlets = (
-            PowerOutlet.objects.create(device=device_2, name="Power Outlet 1", power_port=powerports[0]),
-            PowerOutlet.objects.create(device=device_2, name="Power Outlet 2", power_port=powerports[1]),
+            PowerOutlet.objects.create(device=device_2, name="Power Outlet 1"),
+            PowerOutlet.objects.create(device=device_2, name="Power Outlet 2"),
         )
 
         powerpanel = PowerPanel.objects.create(location=location, name="Power Panel 1")