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

nautobot/ipam/tables.py

@@ -1,5 +1,5 @@
-import django_tables2 as tables
 from django.utils.safestring import mark_safe
+import django_tables2 as tables
 from django_tables2.utils import Accessor
 
 from nautobot.core.tables import (
@@ -18,6 +18,8 @@ from nautobot.dcim.utils import cable_status_color_css
 from nautobot.extras.tables import RoleTableMixin, StatusTableMixin
 from nautobot.tenancy.tables import TenantColumn
 from nautobot.virtualization.models import VMInterface
+from nautobot.virtualization.tables import VMInterfaceTable
+
 from .models import (
     IPAddress,
     IPAddressToInterface,
@@ -33,7 +35,7 @@ from .models import (
     VRFPrefixAssignment,
 )
 
-AVAILABLE_LABEL = mark_safe('<span class="label label-success">Available</span>')  # noqa: S308
+AVAILABLE_LABEL = mark_safe('<span class="label label-success">Available</span>')  # noqa: S308  # suspicious-mark-safe-usage -- known safe string here
 
 UTILIZATION_GRAPH = """
 {% load helpers %}
@@ -622,6 +624,13 @@ class IPAddressInterfaceTable(InterfaceTable):
         }
 
 
+class IPAddressVMInterfaceTable(VMInterfaceTable):
+    class Meta(VMInterfaceTable.Meta):
+        row_attrs = {
+            "data-name": lambda record: record.name,
+        }
+
+
 #
 # IPAddress to Interface
 #

nautobot/ipam/templates/ipam/ipaddress.html

@@ -14,6 +14,13 @@
                 </li>
             {% endif %}
         {% endwith %}
+        {% with vm_interface_count=object.vm_interfaces.count %}
+            {% if vm_interface_count %}
+                <li role="presentation" {% if active_tab == 'vm_interfaces' %} class="active"{% endif %}>
+                    <a href="{% url 'ipam:ipaddress_vm_interfaces' pk=object.pk %}">VM Interfaces {% badge vm_interface_count %}</a>
+                </li>
+            {% endif %}
+        {% endwith %}
 {% endblock extra_nav_tabs %}
 
 {% block content_left_page %}
@@ -86,14 +93,31 @@
                     </td>
                 </tr>
                 <tr>
-                    <!-- TODO: update to work with interface M2M -->
                     <td>Assignment</td>
                     <td>
-                        {% if object.assigned_object %}
-                            {{ object.assigned_object.parent|hyperlinked_object }} ({{ object.assigned_object }})
-                        {% else %}
-                            <span class="text-muted">&mdash;</span>
-                        {% endif %}
+                        {% with interface_count=object.interfaces.count vm_interface_count=object.vm_interfaces.count %}
+                            {% if interface_count == 1 and vm_interface_count == 0 %}
+                                {{ object.interfaces.first.parent|hyperlinked_object }} ({{ object.interfaces.first|hyperlinked_object }})
+                            {% elif interface_count == 0 and vm_interface_count == 1 %}
+                                {{ object.vm_interfaces.first.parent|hyperlinked_object }} ({{ object.vm_interfaces.first|hyperlinked_object }})
+                            {% elif interface_count == 0 and vm_interface_count == 0 %}
+                                <span class="text-muted">&mdash;</span>
+                            {% else %}
+                                {% if interface_count > 0 %}
+                                    <a href="{% url 'ipam:ipaddress_interfaces' pk=object.pk %}">
+                                        {{ interface_count }} interface{{ interface_count|pluralize }}
+                                    </a>
+                                    {% if vm_interface_count > 0 %}
+                                        <br>
+                                    {% endif %}
+                                {% endif %}
+                                {% if vm_interface_count > 0 %}
+                                    <a href="{% url 'ipam:ipaddress_vm_interfaces' pk=object.pk %}">
+                                        {{ vm_interface_count }} VM interface{{ vm_interface_count|pluralize }}
+                                    </a>
+                                {% endif %}
+                            {% endif %}
+                        {% endwith %}
                     </td>
                 </tr>
                 <tr>

nautobot/ipam/templates/ipam/ipaddress_interfaces.html

@@ -26,7 +26,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/ipam/templates/ipam/ipaddress_vm_interfaces.html

@@ -0,0 +1,32 @@
+{% extends 'ipam/ipaddress.html' %}
+{% load helpers %}
+{% load render_table from django_tables2 %}
+{% load static %}
+
+{% block content %}
+    <form method="post">
+        {% csrf_token %}
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <strong>Interfaces</strong>
+                <div class="pull-right noprint">
+                    {% if request.user.is_authenticated %}
+                        <button type="button" class="btn btn-default btn-xs" data-toggle="modal" data-target="#IPAddressVMInterfaceTable_config" title="Configure table"><i class="mdi mdi-cog"></i> Configure</button>
+                    {% endif %}
+                </div>
+                <div class="pull-right col-md-2 noprint">
+                    <input class="form-control interface-filter" type="text" placeholder="Filter" title="Filter text (regular expressions supported)" style="height: 23px" />
+                </div>
+            </div>
+            {% render_table vm_interface_table 'inc/table.html' %}
+        </div>
+    </form>
+    {% table_config_form vm_interface_table %}
+{% endblock content %}
+
+{% block javascript %}
+    {{ block.super }}
+    <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/ipam/tests/test_api.py

@@ -1,7 +1,7 @@
 from concurrent.futures.thread import ThreadPoolExecutor
 import json
-from unittest import skip
 from random import shuffle
+from unittest import skip
 
 from django.db import connection
 from django.urls import reverse
@@ -16,6 +16,7 @@ from nautobot.ipam import choices
 from nautobot.ipam.models import (
     IPAddress,
     IPAddressToInterface,
+    Namespace,
     Prefix,
     RIR,
     RouteTarget,
@@ -23,7 +24,6 @@ from nautobot.ipam.models import (
     VLAN,
     VLANGroup,
     VRF,
-    Namespace,
 )
 from nautobot.virtualization.models import Cluster, ClusterType, VirtualMachine, VMInterface
 

nautobot/ipam/tests/test_filters.py

@@ -1,7 +1,7 @@
 from django.contrib.contenttypes.models import ContentType
 from django.db.models import Q
 
-from nautobot.core.testing import TestCase, FilterTestCases
+from nautobot.core.testing import FilterTestCases, TestCase
 from nautobot.dcim.choices import InterfaceTypeChoices
 from nautobot.dcim.models import (
     Device,
@@ -27,6 +27,7 @@ from nautobot.ipam.filters import (
 from nautobot.ipam.models import (
     IPAddress,
     IPAddressToInterface,
+    Namespace,
     Prefix,
     RIR,
     RouteTarget,
@@ -34,7 +35,6 @@ from nautobot.ipam.models import (
     VLAN,
     VLANGroup,
     VRF,
-    Namespace,
 )
 from nautobot.tenancy.models import Tenant
 from nautobot.virtualization.models import (
@@ -310,10 +310,9 @@ class PrefixFilterCustomDataTestCase(TestCase):
     def test_contains(self):
         matches_ipv4 = self.queryset.filter(network__in=["10.0.0.0", "10.0.1.0"])
         matches_ipv6 = self.queryset.filter(network__in=["2001:db8::", "2001:db8:0:1::"])
-        params = {"contains": "10.0.1.0/24"}
-        self.assertQuerysetEqualAndNotEmpty(self.filterset(params, self.queryset).qs, matches_ipv4)
-        params = {"contains": "2001:db8:0:1::/64"}
-        self.assertQuerysetEqualAndNotEmpty(self.filterset(params, self.queryset).qs, matches_ipv6)
+
+        params = {"contains": ["10.0.1.0/24", "2001:db8:0:1::"]}
+        self.assertQuerysetEqualAndNotEmpty(self.filterset(params, self.queryset).qs, matches_ipv4 | matches_ipv6)
 
     def test_vrfs(self):
         prefixes = self.queryset[:2]
@@ -427,15 +426,15 @@ class IPAddressTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyF
     def setUpTestData(cls):
         # Create some VRFs that belong to the same Namespace and have an rd
         cls.namespace = Namespace.objects.create(name="IP Address Test Case Namespace")
-        VRF.objects.create(name="VRF 1", rd="65000:100", namespace=cls.namespace)
-        VRF.objects.create(name="VRF 2", rd="65000:200", namespace=cls.namespace)
-        VRF.objects.create(name="VRF 3", rd="65000:300", namespace=cls.namespace)
+        vrfs = (
+            VRF.objects.create(name="VRF 1", rd="65000:100", namespace=cls.namespace),
+            VRF.objects.create(name="VRF 2", rd="65000:200", namespace=cls.namespace),
+            VRF.objects.create(name="VRF 3", rd="65000:300", namespace=cls.namespace),
+        )
         # Create some VRFs without an rd
         VRF.objects.create(name="VRF 4", namespace=cls.namespace)
         VRF.objects.create(name="VRF 5", namespace=cls.namespace)
         VRF.objects.create(name="VRF 6", namespace=cls.namespace)
-        vrfs = VRF.objects.filter(namespace=cls.namespace, rd__isnull=False)
-        assert len(vrfs) == 3, f"This Namespace {cls.namespace} does not contain enough VRFs."
 
         cls.interface_ct = ContentType.objects.get_for_model(Interface)
         cls.vm_interface_ct = ContentType.objects.get_for_model(VMInterface)
@@ -664,14 +663,11 @@ class IPAddressTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyF
 
     def test_prefix(self):
         ipv4_parent = self.queryset.filter(ip_version=4).first().address.supernet()[-1]
-        params = {"prefix": str(ipv4_parent)}
-        self.assertQuerysetEqualAndNotEmpty(
-            self.filterset(params, self.queryset).qs, self.queryset.net_host_contained(ipv4_parent)
-        )
         ipv6_parent = self.queryset.filter(ip_version=6).first().address.supernet()[-1]
-        params = {"prefix": str(ipv6_parent)}
+
+        params = {"prefix": [str(ipv4_parent), str(ipv6_parent)]}
         self.assertQuerysetEqualAndNotEmpty(
-            self.filterset(params, self.queryset).qs, self.queryset.net_host_contained(ipv6_parent)
+            self.filterset(params, self.queryset).qs, self.queryset.net_host_contained(ipv4_parent, ipv6_parent)
         )
 
     def test_filter_address(self):

nautobot/ipam/tests/test_migrations.py

@@ -1,6 +1,5 @@
-import uuid
-
 from unittest import skip, skipIf
+import uuid
 
 from django.db import connection
 

nautobot/ipam/tests/test_models.py

@@ -1,11 +1,11 @@
 from unittest import skipIf
 
-import netaddr
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 from django.db import connection, IntegrityError
 from django.db.models import ProtectedError
 from django.test import TestCase
+import netaddr
 
 from nautobot.core.testing.models import ModelTestCases
 from nautobot.dcim import choices as dcim_choices
@@ -13,6 +13,7 @@ from nautobot.dcim.models import Device, DeviceType, Interface, Location, Locati
 from nautobot.extras.models import Role, Status
 from nautobot.ipam.choices import IPAddressTypeChoices, PrefixTypeChoices, ServiceProtocolChoices
 from nautobot.ipam.models import (
+    get_default_namespace,
     IPAddress,
     IPAddressToInterface,
     Namespace,
@@ -978,10 +979,24 @@ class TestIPAddress(ModelTestCases.BaseModelTestCase):
         self.assertEqual(expected_err_msg, err.exception.message_dict["parent"][0])
 
     def test_creating_an_ipaddress_without_namespace_or_parent(self):
+        # No namespace, and no appropriate parent in the default namespace --> error
         with self.assertRaises(ValidationError) as err:
             ip = IPAddress(address="1976:2023::1/128", status=self.status)
             ip.validated_save()
-        self.assertEqual(err.exception.message_dict["parent"][0], "Either a parent or a namespace must be provided.")
+        self.assertIn("namespace", err.exception.message_dict)
+        self.assertEqual(
+            err.exception.message_dict["namespace"][0],
+            "No suitable parent Prefix exists in this Namespace",
+        )
+
+        # Appropriate parent exists in the default namespace --> no error
+        Prefix.objects.create(
+            prefix="1976:2023::/32",
+            status=self.status,
+            namespace=get_default_namespace(),
+            type=PrefixTypeChoices.TYPE_NETWORK,
+        )
+        ip.validated_save()
 
     def test_varbinary_ip_fields_with_empty_values_do_not_violate_not_null_constrains(self):
         # Assert that an error is triggered when the host is not provided.

nautobot/ipam/tests/test_ordering.py

@@ -1,5 +1,5 @@
-from unittest import skip
 from operator import attrgetter
+from unittest import skip
 
 from nautobot.core.testing import TestCase
 from nautobot.ipam.models import IPAddress, Prefix

nautobot/ipam/tests/test_querysets.py

@@ -1,13 +1,13 @@
 import re
 from unittest import skipIf
 
-import netaddr
 from django.db import connection
+import netaddr
 
 from nautobot.core.testing import TestCase
 from nautobot.extras.models import Status
 from nautobot.ipam import choices
-from nautobot.ipam.models import Prefix, IPAddress, Namespace
+from nautobot.ipam.models import IPAddress, Namespace, Prefix
 
 
 class IPAddressQuerySet(TestCase):

nautobot/ipam/tests/test_views.py

@@ -1,16 +1,16 @@
 import datetime
 import random
 
-from netaddr import IPNetwork
 from django.contrib.contenttypes.models import ContentType
 from django.test import override_settings
+from django.urls import reverse
 from django.utils.html import strip_tags
 from django.utils.timezone import make_aware
-from django.urls import reverse
+from netaddr import IPNetwork
 
 from nautobot.circuits.models import Circuit, Provider
 from nautobot.core.templatetags.helpers import queryset_to_pks
-from nautobot.core.testing import post_data, ModelViewTestCase, ViewTestCases
+from nautobot.core.testing import ModelViewTestCase, post_data, ViewTestCases
 from nautobot.core.testing.utils import extract_page_body
 from nautobot.dcim.models import Device, DeviceType, Interface, Location, LocationType, Manufacturer
 from nautobot.extras.choices import CustomFieldTypeChoices, RelationshipTypeChoices
@@ -627,7 +627,7 @@ class IPAddressMergeTestCase(ModelViewTestCase):
                 ],
             },
         )
-        cls.dup_ip_1.tags.set(random.choices(Tag.objects.get_for_model(IPAddress), k=3))
+        cls.dup_ip_1.tags.set(random.choices(Tag.objects.get_for_model(IPAddress), k=3))  # noqa: S311  # suspicious-non-cryptographic-random-usage -- ok here in test code
         parent_2, _ = Prefix.objects.get_or_create(
             prefix="94.0.0.2/12",
             defaults={"namespace": cls.namespace_2, "status": prefix_status, "type": "network"},
@@ -651,7 +651,7 @@ class IPAddressMergeTestCase(ModelViewTestCase):
                 ],
             },
         )
-        cls.dup_ip_2.tags.set(random.choices(Tag.objects.get_for_model(IPAddress), k=2))
+        cls.dup_ip_2.tags.set(random.choices(Tag.objects.get_for_model(IPAddress), k=2))  # noqa: S311  # suspicious-non-cryptographic-random-usage -- ok here in test code
         parent_3, _ = Prefix.objects.get_or_create(
             prefix="94.0.0.2/15",
             defaults={"namespace": namespace_3, "status": prefix_status, "type": "network"},
@@ -675,7 +675,7 @@ class IPAddressMergeTestCase(ModelViewTestCase):
                 ],
             },
         )
-        cls.dup_ip_3.tags.set(random.choices(Tag.objects.get_for_model(IPAddress), k=3))
+        cls.dup_ip_3.tags.set(random.choices(Tag.objects.get_for_model(IPAddress), k=3))  # noqa: S311  # suspicious-non-cryptographic-random-usage -- ok here in test code
         cls.merge_data = {
             "pk": [cls.dup_ip_1.pk, cls.dup_ip_2.pk, cls.dup_ip_3.pk],
             "host": cls.dup_ip_1.host,

nautobot/ipam/urls.py

@@ -2,6 +2,7 @@ from django.urls import path
 
 from nautobot.core.views.routers import NautobotUIViewSetRouter
 from nautobot.extras.views import ObjectChangeLogView, ObjectDynamicGroupsView, ObjectNotesView
+
 from . import views
 from .models import (
     IPAddress,
@@ -213,6 +214,11 @@ urlpatterns = [
         views.IPAddressInterfacesView.as_view(),
         name="ipaddress_interfaces",
     ),
+    path(
+        "ip-addresses/<uuid:pk>/vm-interfaces/",
+        views.IPAddressVMInterfacesView.as_view(),
+        name="ipaddress_vm_interfaces",
+    ),
     path(
         "ip-addresses/<uuid:pk>/notes/",
         ObjectNotesView.as_view(),

nautobot/ipam/utils/migrations.py

@@ -5,7 +5,6 @@ from django.core.exceptions import ValidationError
 from django.db import models
 import netaddr
 
-
 BASE_NAME = "Cleanup Namespace"
 DESCRIPTION = "Created by Nautobot 2.0 IPAM data migrations."
 GLOBAL_NS = "Global"

nautobot/ipam/views.py

@@ -1,5 +1,4 @@
 import logging
-import netaddr
 
 from django.conf import settings
 from django.contrib import messages
@@ -7,27 +6,29 @@ from django.core.cache import cache
 from django.db import models, transaction
 from django.db.models import Count, Prefetch, ProtectedError, Q
 from django.forms.models import model_to_dict
-from django.templatetags.static import static
 from django.shortcuts import get_object_or_404, redirect, render
+from django.templatetags.static import static
 from django.urls import reverse
 from django.utils.html import format_html
 from django.utils.http import urlencode
 from django.views.generic import View
 from django_tables2 import RequestConfig
+import netaddr
 
-from nautobot.core.utils.permissions import get_permission_for_model
 from nautobot.core.models.querysets import count_related
 from nautobot.core.utils.config import get_settings_or_config
+from nautobot.core.utils.permissions import get_permission_for_model
 from nautobot.core.views import generic, mixins as view_mixins
 from nautobot.core.views.paginator import EnhancedPaginator, get_paginate_count
 from nautobot.core.views.utils import handle_protectederror
 from nautobot.dcim.models import Device, Interface
 from nautobot.extras.models import Role, Status, Tag
+from nautobot.ipam import choices, constants
+from nautobot.ipam.api import serializers
 from nautobot.tenancy.models import Tenant
 from nautobot.virtualization.models import VirtualMachine, VMInterface
+
 from . import filters, forms, tables
-from nautobot.ipam.api import serializers
-from nautobot.ipam import choices, constants
 from .models import (
     IPAddress,
     IPAddressToInterface,
@@ -48,7 +49,6 @@ from .utils import (
     retrieve_interface_or_vminterface_from_request,
 )
 
-
 logger = logging.getLogger(__name__)
 
 #
@@ -1153,6 +1153,26 @@ class IPAddressInterfacesView(generic.ObjectView):
         }
 
 
+class IPAddressVMInterfacesView(generic.ObjectView):
+    queryset = IPAddress.objects.all()
+    template_name = "ipam/ipaddress_vm_interfaces.html"
+
+    def get_extra_context(self, request, instance):
+        vm_interfaces = instance.vm_interfaces.restrict(request.user, "view").prefetch_related(
+            Prefetch("ip_addresses", queryset=IPAddress.objects.restrict(request.user)),
+        )
+        vm_interface_table = tables.IPAddressVMInterfaceTable(data=vm_interfaces, user=request.user, orderable=False)
+        if request.user.has_perm("virtualization.change_vminterface") or request.user.has_perm(
+            "virtualization.delete_vminterface"
+        ):
+            vm_interface_table.columns.show("pk")
+
+        return {
+            "vm_interface_table": vm_interface_table,
+            "active_tab": "vm_interfaces",
+        }
+
+
 #
 # IPAddress to Interface (assignments
 #