nautobot 2.3.16__py3-none-any.whl → 2.4.0__py3-none-any.whl

nautobot/extras/webhooks.py

@@ -6,12 +6,13 @@ from nautobot.extras.registry import registry
 from nautobot.extras.tasks import process_webhook
 
 
-def enqueue_webhooks(object_change, webhook_queryset=None):
+def enqueue_webhooks(object_change, snapshots=None, webhook_queryset=None):
     """
     Find Webhook(s) assigned to this instance + action and enqueue them to be processed.
 
     Args:
         object_change (ObjectChange): The change that may trigger Webhooks to be sent.
+        snapshots (list): The before/after data snapshots corresponding to the object_change.
         webhook_queryset (QuerySet): Previously retrieved set of Webhooks to potentially send.
 
     Returns:
@@ -34,6 +35,8 @@ def enqueue_webhooks(object_change, webhook_queryset=None):
         webhook_queryset = Webhook.objects.filter(content_types=content_type, enabled=True, **{action_flag: True})
 
     if webhook_queryset:  # not .exists() as we *want* to populate the queryset cache
+        if snapshots is None:
+            snapshots = object_change.get_snapshots()
         # fall back to object_data if object_data_v2 is not available
         serialized_data = object_change.object_data_v2
         if serialized_data is None:
@@ -49,7 +52,7 @@ def enqueue_webhooks(object_change, webhook_queryset=None):
                 str(timezone.now()),
                 object_change.user_name,
                 object_change.request_id,
-                object_change.get_snapshots(),
+                snapshots,
             ]
             process_webhook.apply_async(args=args)
 

nautobot/ipam/api/serializers.py

@@ -42,7 +42,6 @@ class NamespaceSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
     class Meta:
         model = Namespace
         fields = "__all__"
-        list_display_fields = ["name", "description", "location"]
 
 
 #
@@ -54,7 +53,6 @@ class VRFSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
     class Meta:
         model = VRF
         fields = "__all__"
-        list_display_fields = ["name", "rd", "tenant", "description"]
         extra_kwargs = {"namespace": {"default": get_default_namespace}}
 
 
@@ -91,7 +89,6 @@ class RouteTargetSerializer(NautobotModelSerializer, TaggedModelSerializerMixin)
     class Meta:
         model = RouteTarget
         fields = "__all__"
-        list_display_fields = ["name", "tenant", "description"]
 
 
 #
@@ -105,12 +102,6 @@ class RIRSerializer(NautobotModelSerializer):
     class Meta:
         model = RIR
         fields = "__all__"
-        list_display_fields = [
-            "name",
-            "is_private",
-            "assigned_prefix_count",
-            "description",
-        ]
 
 
 #
@@ -124,7 +115,6 @@ class VLANGroupSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
     class Meta:
         model = VLANGroup
         fields = "__all__"
-        list_display_fields = ["name", "location", "vlan_count", "description"]
 
 
 class VLANSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
@@ -139,20 +129,7 @@ class VLANSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
 
     class Meta:
         model = VLAN
-        # TODO(jathan): These were taken from VLANDetailTable and not VLANTable. Let's make sure
-        # these are correct.
         fields = "__all__"
-        list_display_fields = [
-            "vid",
-            "locations",
-            "vlan_group",
-            "name",
-            "prefixes",
-            "tenant",
-            "status",
-            "role",
-            "description",
-        ]
         validators = []
         extra_kwargs = {"locations": {"read_only": True}}
 
@@ -228,52 +205,21 @@ class PrefixSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
         write_only=True,
     )
 
+    def get_field_names(self, declared_fields, info):
+        """Add reverse M2M for VRF's to the fields for this serializer."""
+        field_names = list(super().get_field_names(declared_fields, info))
+        self.extend_field_names(field_names, "vrfs")
+        return field_names
+
     class Meta:
         model = Prefix
         fields = "__all__"
-        list_display_fields = [
-            "prefix",
-            "namespace",
-            "type",
-            "status",
-            "vrf",
-            "tenant",
-            "locations",
-            "vlan",
-            "role",
-            "description",
-        ]
         extra_kwargs = {
             "ip_version": {"read_only": True},
             "namespace": {"default": get_default_namespace},
             "prefix_length": {"read_only": True},
             "locations": {"read_only": True},
-        }
-
-        detail_view_config = {
-            "layout": [
-                {
-                    "Prefix": {
-                        "fields": [
-                            "prefix",
-                            "parent",
-                            "namespace",
-                            "type",
-                            "network",
-                            "broadcast",
-                            "prefix_length",
-                            "ip_version",
-                            "description",
-                            "role",
-                            "vlan",
-                            "locations",
-                            "tenant",
-                            "rir",
-                            "date_allocated",
-                        ]
-                    },
-                },
-            ],
+            "vrfs": {"read_only": True},
         }
 
 
@@ -374,16 +320,6 @@ class IPAddressSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
     class Meta:
         model = IPAddress
         fields = "__all__"
-        list_display_fields = [
-            "address",
-            "type",
-            "vrf",
-            "status",
-            "role",
-            "tenant",
-            "dns_name",
-            "description",
-        ]
         extra_kwargs = {
             "ip_version": {"read_only": True},
             "mask_length": {"read_only": True},
@@ -391,32 +327,6 @@ class IPAddressSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
             "parent": {"required": False},
         }
 
-        detail_view_config = {
-            "layout": [
-                {
-                    "IP Address": {
-                        "fields": [
-                            # FixMe(timizuo): Missing in new-ui; resolve when working on #4355
-                            "namespace",
-                            "ip_version",
-                            "type",
-                            "role",
-                            "dns_name",
-                            "description",
-                        ]
-                    },
-                    "Operational Details": {
-                        "fields": [
-                            "tenant",
-                            "assigned",  # FixMe(timizuo) Missing in new-ui; resolve when working on #4355
-                            "nat_inside",
-                            "nat_outside_list",
-                        ]
-                    },
-                },
-            ],
-        }
-
     def validate(self, attrs):
         namespace = attrs.get("namespace", None)
         parent = attrs.get("parent", None)
@@ -489,7 +399,9 @@ class VLANAllocationSerializer(NautobotModelSerializer, TaggedModelSerializerMix
     vid = serializers.IntegerField(required=False, min_value=constants.VLAN_VID_MIN, max_value=constants.VLAN_VID_MAX)
 
     def validate(self, attrs):
-        """Skip `ValidatedModel` validation.
+        """
+        Skip `ValidatedModel` validation.
+
         This allows to skip `vid` attribute of `VLAN` model, while validate name and status.
         """
         return attrs
@@ -559,11 +471,6 @@ class ServiceSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
             "device": {"help_text": "Required if no virtual_machine is specified"},
             "virtual_machine": {"help_text": "Required if no device is specified"},
         }
-        # TODO(jathan): We need to account for the "parent" field from the `ServiceTable` which is
-        # an either/or column for `device` or `virtual_machine`. For now it's hard-coded to
-        # `device`.
-        # list_display_fields = ["name", "parent", "protocol", "ports", "description"]
-        list_display_fields = ["name", "device", "protocol", "ports", "description"]
 
     def validate(self, attrs):
         if attrs.get("device"):

nautobot/ipam/api/views.py

@@ -9,6 +9,7 @@ from rest_framework.response import Response
 from rest_framework.serializers import IntegerField, ListSerializer
 
 from nautobot.core.api.authentication import TokenPermissions
+from nautobot.core.constants import MAX_PAGE_SIZE_DEFAULT, PAGINATE_COUNT_DEFAULT
 from nautobot.core.models.querysets import count_related
 from nautobot.core.utils.config import get_settings_or_config
 from nautobot.dcim.models import Location
@@ -49,21 +50,19 @@ class NamespaceViewSet(NautobotModelViewSet):
 
 
 class VRFViewSet(NautobotModelViewSet):
-    queryset = VRF.objects.select_related("namespace", "tenant").prefetch_related(
-        "devices", "virtual_machines", "prefixes", "import_targets", "export_targets", "tags"
-    )
+    queryset = VRF.objects.all()
     serializer_class = serializers.VRFSerializer
     filterset_class = filters.VRFFilterSet
 
 
 class VRFDeviceAssignmentViewSet(NautobotModelViewSet):
-    queryset = VRFDeviceAssignment.objects.select_related("vrf", "device", "virtual_machine")
+    queryset = VRFDeviceAssignment.objects.all()
     serializer_class = serializers.VRFDeviceAssignmentSerializer
     filterset_class = filters.VRFDeviceAssignmentFilterSet
 
 
 class VRFPrefixAssignmentViewSet(NautobotModelViewSet):
-    queryset = VRFPrefixAssignment.objects.select_related("vrf", "prefix")
+    queryset = VRFPrefixAssignment.objects.all()
     serializer_class = serializers.VRFPrefixAssignmentSerializer
     filterset_class = filters.VRFPrefixAssignmentFilterSet
 
@@ -74,7 +73,7 @@ class VRFPrefixAssignmentViewSet(NautobotModelViewSet):
 
 
 class RouteTargetViewSet(NautobotModelViewSet):
-    queryset = RouteTarget.objects.select_related("tenant").prefetch_related("tags")
+    queryset = RouteTarget.objects.all()
     serializer_class = serializers.RouteTargetSerializer
     filterset_class = filters.RouteTargetFilterSet
 
@@ -109,21 +108,14 @@ class RIRViewSet(NautobotModelViewSet):
     update=extend_schema(responses={"200": serializers.PrefixLegacySerializer}, versions=["2.0", "2.1"]),
 )
 class PrefixViewSet(NautobotModelViewSet):
-    queryset = Prefix.objects.select_related(
-        "namespace",
-        "parent",
-        "rir",
-        "role",
-        "status",
-        "tenant",
-        "vlan",
-    ).prefetch_related("locations", "tags")
+    queryset = Prefix.objects.all()
     serializer_class = serializers.PrefixSerializer
     filterset_class = filters.PrefixFilterSet
 
     def get_serializer_class(self):
         if (
             not getattr(self, "swagger_fake_view", False)
+            and hasattr(self.request, "major_version")
             and self.request.major_version == 2
             and self.request.minor_version < 2
         ):
@@ -303,11 +295,15 @@ class PrefixViewSet(NautobotModelViewSet):
         # Determine the maximum number of IPs to return
         else:
             try:
-                limit = int(request.query_params.get("limit", get_settings_or_config("PAGINATE_COUNT")))
+                limit = int(
+                    request.query_params.get(
+                        "limit", get_settings_or_config("PAGINATE_COUNT", fallback=PAGINATE_COUNT_DEFAULT)
+                    )
+                )
             except ValueError:
-                limit = get_settings_or_config("PAGINATE_COUNT")
-            if get_settings_or_config("MAX_PAGE_SIZE"):
-                limit = min(limit, get_settings_or_config("MAX_PAGE_SIZE"))
+                limit = get_settings_or_config("PAGINATE_COUNT", fallback=PAGINATE_COUNT_DEFAULT)
+            if get_settings_or_config("MAX_PAGE_SIZE", fallback=MAX_PAGE_SIZE_DEFAULT):
+                limit = min(limit, get_settings_or_config("MAX_PAGE_SIZE", fallback=MAX_PAGE_SIZE_DEFAULT))
 
             # Calculate available IPs within the prefix
             ip_list = []
@@ -328,7 +324,7 @@ class PrefixViewSet(NautobotModelViewSet):
 
 
 class PrefixLocationAssignmentViewSet(NautobotModelViewSet):
-    queryset = PrefixLocationAssignment.objects.select_related("prefix", "location")
+    queryset = PrefixLocationAssignment.objects.all()
     serializer_class = serializers.PrefixLocationAssignmentSerializer
     filterset_class = filters.PrefixLocationAssignmentFilterSet
 
@@ -339,13 +335,7 @@ class PrefixLocationAssignmentViewSet(NautobotModelViewSet):
 
 
 class IPAddressViewSet(NautobotModelViewSet):
-    queryset = IPAddress.objects.select_related(
-        "nat_inside",
-        "parent",
-        "role",
-        "status",
-        "tenant",
-    ).prefetch_related("tags", "nat_outside_list")
+    queryset = IPAddress.objects.select_related("parent__namespace")
     serializer_class = serializers.IPAddressSerializer
     filterset_class = filters.IPAddressFilterSet
 
@@ -356,7 +346,7 @@ class IPAddressViewSet(NautobotModelViewSet):
 
 
 class IPAddressToInterfaceViewSet(NautobotModelViewSet):
-    queryset = IPAddressToInterface.objects.select_related("interface", "ip_address", "vm_interface")
+    queryset = IPAddressToInterface.objects.all()
     serializer_class = serializers.IPAddressToInterfaceSerializer
     filterset_class = filters.IPAddressToInterfaceFilterSet
 
@@ -367,11 +357,7 @@ class IPAddressToInterfaceViewSet(NautobotModelViewSet):
 
 
 class VLANGroupViewSet(NautobotModelViewSet):
-    queryset = (
-        VLANGroup.objects.select_related("location")
-        .prefetch_related("tags")
-        .annotate(vlan_count=count_related(VLAN, "vlan_group"))
-    )
+    queryset = VLANGroup.objects.annotate(vlan_count=count_related(VLAN, "vlan_group"))
     serializer_class = serializers.VLANGroupSerializer
     filterset_class = filters.VLANGroupFilterSet
 
@@ -503,12 +489,16 @@ class VLANGroupViewSet(NautobotModelViewSet):
 
         else:
             try:
-                limit = int(request.query_params.get("limit", get_settings_or_config("PAGINATE_COUNT")))
+                limit = int(
+                    request.query_params.get(
+                        "limit", get_settings_or_config("PAGINATE_COUNT", fallback=PAGINATE_COUNT_DEFAULT)
+                    )
+                )
             except ValueError:
-                limit = get_settings_or_config("PAGINATE_COUNT")
+                limit = get_settings_or_config("PAGINATE_COUNT", fallback=PAGINATE_COUNT_DEFAULT)
 
-            if get_settings_or_config("MAX_PAGE_SIZE"):
-                limit = min(limit, get_settings_or_config("MAX_PAGE_SIZE"))
+            if get_settings_or_config("MAX_PAGE_SIZE", fallback=MAX_PAGE_SIZE_DEFAULT):
+                limit = min(limit, get_settings_or_config("MAX_PAGE_SIZE", fallback=MAX_PAGE_SIZE_DEFAULT))
 
             if isinstance(limit, int) and limit >= 0:
                 vids = vlan_group.available_vids[0:limit]
@@ -549,16 +539,7 @@ class VLANGroupViewSet(NautobotModelViewSet):
     update=extend_schema(responses={"200": serializers.VLANLegacySerializer}, versions=["2.0", "2.1"]),
 )
 class VLANViewSet(NautobotModelViewSet):
-    queryset = (
-        VLAN.objects.select_related(
-            "vlan_group",
-            "status",
-            "role",
-            "tenant",
-        )
-        .prefetch_related("tags")
-        .annotate(prefix_count=count_related(Prefix, "vlan"))
-    )
+    queryset = VLAN.objects.annotate(prefix_count=count_related(Prefix, "vlan"))
     serializer_class = serializers.VLANSerializer
     filterset_class = filters.VLANFilterSet
 
@@ -573,6 +554,7 @@ class VLANViewSet(NautobotModelViewSet):
     def get_serializer_class(self):
         if (
             not getattr(self, "swagger_fake_view", False)
+            and hasattr(self.request, "major_version")
             and self.request.major_version == 2
             and self.request.minor_version < 2
         ):
@@ -600,7 +582,7 @@ class VLANViewSet(NautobotModelViewSet):
 
 
 class VLANLocationAssignmentViewSet(NautobotModelViewSet):
-    queryset = VLANLocationAssignment.objects.select_related("vlan", "location")
+    queryset = VLANLocationAssignment.objects.all()
     serializer_class = serializers.VLANLocationAssignmentSerializer
     filterset_class = filters.VLANLocationAssignmentFilterSet
 
@@ -611,6 +593,6 @@ class VLANLocationAssignmentViewSet(NautobotModelViewSet):
 
 
 class ServiceViewSet(NautobotModelViewSet):
-    queryset = Service.objects.select_related("device", "virtual_machine").prefetch_related("tags", "ip_addresses")
+    queryset = Service.objects.all()
     serializer_class = serializers.ServiceSerializer
     filterset_class = filters.ServiceFilterSet

nautobot/ipam/factory.py

@@ -410,7 +410,7 @@ class PrefixFactory(PrimaryModelFactory):
             # Calculate prefix length for child prefixes to allow them to fit in the parent prefix without creating duplicate prefix
             child_cidr = self.prefix_length + max(1, math.ceil(math.log(child_count, 2)))
             # Raise exception for invalid cidr length (>128 for ipv6, >32 for ipv4)
-            if child_cidr > 128 or self.ip_version == 4 and child_cidr > 32:
+            if child_cidr > 128 or (self.ip_version == 4 and child_cidr > 32):
                 raise ValueError(f"Unable to create {child_count} child prefixes in container prefix {self.cidr_str}.")
 
             weights = [1, 6, 3]  # prefer network and pool prefixes

nautobot/ipam/filters.py

@@ -1,4 +1,5 @@
 import contextlib
+import uuid
 
 from django.core.exceptions import ValidationError
 from django.db.models import Q
@@ -323,7 +324,7 @@ class PrefixFilterSet(
         return prefixes_queryset
 
     def generate_query_filter_present_in_vrf(self, value):
-        if isinstance(value, str):
+        if isinstance(value, (str, uuid.UUID)):
             value = VRF.objects.get(pk=value)
 
         query = Q(vrfs=value) | Q(vrfs__export_targets__in=value.import_targets.all())
@@ -485,7 +486,7 @@ class IPAddressFilterSet(
             return queryset.none()
 
     def generate_query_filter_present_in_vrf(self, value):
-        if isinstance(value, str):
+        if isinstance(value, (str, uuid.UUID)):
             value = VRF.objects.get(pk=value)
 
         query = Q(parent__vrfs=value) | Q(parent__vrfs__export_targets__in=value.import_targets.all())

nautobot/ipam/models.py

@@ -27,18 +27,18 @@ from .querysets import IPAddressQuerySet, PrefixQuerySet, RIRQuerySet, VLANQuery
 from .validators import DNSValidator
 
 __all__ = (
+    "RIR",
+    "VLAN",
+    "VRF",
     "IPAddress",
     "IPAddressToInterface",
     "Namespace",
     "Prefix",
     "PrefixLocationAssignment",
-    "RIR",
     "RouteTarget",
     "Service",
-    "VLAN",
     "VLANGroup",
     "VLANLocationAssignment",
-    "VRF",
     "VRFDeviceAssignment",
     "VRFPrefixAssignment",
 )
@@ -648,19 +648,18 @@ class Prefix(PrimaryModel):
         return None
 
     def clean(self):
-        if self.prefix:
-            # self.parent depends on self.prefix having a value
-            self.parent = self.get_parent()
-        super().clean()
-
-    def save(self, *args, **kwargs):
-        if isinstance(self.prefix, netaddr.IPNetwork):
+        if self.prefix is not None:  # missing network/prefix_length will be caught by super().clean()
             # Clear host bits from prefix
             # This also has the subtle side effect of calling self._deconstruct_prefix(),
             # which will (re)set the broadcast and ip_version values of this instance to their correct values.
             self.prefix = self.prefix.cidr
 
-        self.parent = self.get_parent()
+            self.parent = self.get_parent()
+
+        super().clean()
+
+    def save(self, *args, **kwargs):
+        self.clean()
 
         # Validate that creation of this prefix does not create an invalid parent/child relationship
         # 3.0 TODO: uncomment this to enforce this constraint
@@ -1408,7 +1407,6 @@ class VLANGroup(PrimaryModel):
 
     def clean(self):
         super().clean()
-
         # Validate location
         if self.location is not None:
             if ContentType.objects.get_for_model(self) not in self.location.location_type.content_types.all():

nautobot/ipam/navigation.py

@@ -1,7 +1,4 @@
 from nautobot.core.apps import (
-    NavContext,
-    NavGrouping,
-    NavItem,
     NavMenuAddButton,
     NavMenuGroup,
     NavMenuItem,
@@ -205,90 +202,3 @@ menu_items = (
         ),
     ),
 )
-
-
-navigation = (
-    NavContext(
-        name="Networks",
-        groups=(
-            NavGrouping(
-                name="IP Management",
-                weight=100,
-                items=(
-                    NavItem(
-                        name="IP Addresses",
-                        weight=100,
-                        link="ipam:ipaddress_list",
-                        permissions=["ipam.view_ipaddress"],
-                    ),
-                    NavItem(
-                        name="Prefixes",
-                        weight=200,
-                        link="ipam:prefix_list",
-                        permissions=["ipam.view_prefix"],
-                    ),
-                    NavItem(
-                        name="RIRs",
-                        weight=300,
-                        link="ipam:rir_list",
-                        permissions=["ipam.view_rir"],
-                    ),
-                ),
-            ),
-            NavGrouping(
-                name="Layer 2 / Switching",
-                weight=200,
-                items=(
-                    NavItem(
-                        name="VLANs",
-                        weight=100,
-                        link="ipam:vlan_list",
-                        permissions=["ipam.view_vlan"],
-                    ),
-                    NavItem(
-                        name="VLAN Groups",
-                        weight=200,
-                        link="ipam:vlangroup_list",
-                        permissions=["ipam.view_vlangroup"],
-                    ),
-                ),
-            ),
-            NavGrouping(
-                name="Layer 3 / Routing",
-                weight=300,
-                items=(
-                    NavItem(
-                        name="Namespaces",
-                        weight=100,
-                        link="ipam:namespace_list",
-                        permissions=["ipam.view_namespace"],
-                    ),
-                    NavItem(
-                        name="VRFs",
-                        weight=200,
-                        link="ipam:vrf_list",
-                        permissions=["ipam.view_vrf"],
-                    ),
-                    NavItem(
-                        name="Route Targets",
-                        weight=300,
-                        link="ipam:routetarget_list",
-                        permissions=["ipam.view_routetarget"],
-                    ),
-                ),
-            ),
-            NavGrouping(
-                name="Services",
-                weight=400,
-                items=(
-                    NavItem(
-                        name="Services",
-                        weight=100,
-                        link="ipam:service_list",
-                        permissions=["ipam.view_service"],
-                    ),
-                ),
-            ),
-        ),
-    ),
-)

nautobot/ipam/tables.py

@@ -43,9 +43,11 @@ UTILIZATION_GRAPH = """
 """
 
 
+# record: the Prefix being rendered in this row
+# object: the base ancestor Prefix, in the case of PrefixDetailTable, else None
 PREFIX_COPY_LINK = """
 {% load helpers %}
-{% tree_hierarchy_ui_representation record.ancestors.count|as_range table.hide_hierarchy_ui%}
+{% tree_hierarchy_ui_representation record.ancestors.count|as_range table.hide_hierarchy_ui base_tree_depth|default:0 %}
 <span class="hover_copy">
   <a href="\
 {% if record.present_in_database %}\

nautobot/ipam/templates/ipam/ipaddress.html

@@ -83,15 +83,7 @@
                 <strong>Operational Details</strong>
             </div>
             <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Tenant</td>
-                    <td>
-                        {% if object.tenant and object.tenant.tenant_group %}
-                            {{ object.tenant.tenant_group|hyperlinked_object }} /
-                        {% endif %}
-                        {{ object.tenant|hyperlinked_object }}
-                    </td>
-                </tr>
+                {% include 'inc/tenant_table_row.html' %}
                 <tr>
                     <td>Assignment</td>
                     <td>

nautobot/ipam/templates/ipam/ipaddress_bulk_add.html

@@ -21,12 +21,6 @@
             {% render_field model_form.description %}
         </div>
     </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Tenancy</strong></div>
-        <div class="panel-body">
-            {% render_field model_form.tenant_group %}
-            {% render_field model_form.tenant %}
-        </div>
-    </div>
+    {% include 'inc/tenancy_form_panel.html' %}
     {% include 'inc/extras_features_edit_form_fields.html' with form=model_form %}
 {% endblock %}

nautobot/ipam/templates/ipam/ipaddress_edit.html

@@ -22,13 +22,7 @@
             {% render_field form.description %}
         </div>
     </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Tenancy</strong></div>
-        <div class="panel-body">
-            {% render_field form.tenant_group %}
-            {% render_field form.tenant %}
-        </div>
-    </div>
+    {% include 'inc/tenancy_form_panel.html' %}
     <div class="panel panel-default">
         <div class="panel-heading"><strong>NAT IP (Inside)</strong></div>
         <div class="panel-body">