nautobot 2.4.9__py3-none-any.whl → 2.4.11__py3-none-any.whl

nautobot/ipam/templates/ipam/vlan.html

@@ -1,84 +1,2 @@
-{% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block extra_breadcrumbs %}
-    {% if object.vlan_group %}
-        <li><a href="{% url 'ipam:vlan_list' %}?vlan_group={{ object.vlan_group.name }}">{{ object.vlan_group }}</a></li>
-    {% endif %}
-{% endblock extra_breadcrumbs %}
-
-{% block extra_nav_tabs %}
-        <li role="presentation"{% if active_tab == 'interfaces' %} class="active"{% endif %}>
-            <a href="{% url 'ipam:vlan_interfaces' pk=object.pk %}">Device Interfaces <span class="badge">{{ object.get_interfaces.count }}</span></a>
-        </li>
-        <li role="presentation"{% if active_tab == 'vminterfaces' %} class="active"{% endif %}>
-            <a href="{% url 'ipam:vlan_vminterfaces' pk=object.pk %}">VM Interfaces <span class="badge">{{ object.get_vminterfaces.count }}</span></a>
-        </li>
-{% endblock extra_nav_tabs %}
-
-{% block content_left_page %}
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <strong>VLAN</strong>
-                </div>
-                <table class="table table-hover panel-body attr-table">
-                    <tr>
-                        <td>Locations</td>
-                        <td>
-                            {% for location in object.locations.all %}
-                                {{ location|hyperlinked_object }}<br>
-                            {% empty %}
-                                <span class="text-muted">None</span>
-                            {% endfor %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>VLAN Group</td>
-                        <td>{{ object.vlan_group|hyperlinked_object }}</td>
-                    </tr>
-                    <tr>
-                        <td>VLAN ID</td>
-                        <td>{{ object.vid }}</td>
-                    </tr>
-                    <tr>
-                        <td>Name</td>
-                        <td>{{ object.name }}</td>
-                    </tr>
-                    {% include 'inc/tenant_table_row.html' %}
-                    <tr>
-                        <td>Status</td>
-                        <td>
-                            {{ object.status| hyperlinked_object_with_color }}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Role</td>
-                        <td>{{ object.role | hyperlinked_object_with_color }}</td>
-                    </tr>
-                    <tr>
-                        <td>Description</td>
-                        <td>{{ object.description|placeholder }}</td>
-                    </tr>
-                </table>
-            </div>
-{% endblock content_left_page %}
-
-{% block content_full_width_page %}
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <strong>Prefixes</strong>
-                </div>
-                {% include 'responsive_table.html' with table=prefix_table %}
-                {% if perms.ipam.add_prefix %}
-                    <div class="panel-footer text-right noprint">
-                        <a href="{% url 'ipam:prefix_add' %}?{% if object.tenant %}tenant={{ object.tenant.pk }}{% endif %}&vlan={{ object.pk }}{% for loc in object.locations.all %}&locations={{ loc.pk }}{% endfor %}" class="btn btn-primary btn-xs">
-                            <span class="mdi mdi-plus-thick" aria-hidden="true"></span>
-                            Add a prefix
-                        </a>
-                    </div>
-                {% endif %}
-            </div>
-            {% if prefix_table.paginator.num_pages > 1 %}
-                {% include "inc/paginator.html" with paginator=prefix_table.paginator page=prefix_table.page %}
-            {% endif %}
-{% endblock content_full_width_page %}
+{% extends 'ipam/vlan_retrieve.html' %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/ipam/templates/ipam/vlan_edit.html

@@ -1,24 +1,2 @@
-{% extends 'generic/object_create.html' %}
-{% load form_helpers %}
-
-{% block form %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>VLAN</strong></div>
-        <div class="panel-body">
-            {% render_field form.vid %}
-            {% render_field form.name %}
-            {% render_field form.status %}
-            {% render_field form.role %}
-            {% render_field form.description %}
-        </div>
-    </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Assignment</strong></div>
-        <div class="panel-body">
-            {% render_field form.locations %}
-            {% render_field form.vlan_group %}
-        </div>
-    </div>
-    {% include 'inc/tenancy_form_panel.html' %}
-    {% include 'inc/extras_features_edit_form_fields.html' %}
-{% endblock %}
+{% extends 'ipam/vlan_update.html' %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/ipam/templates/ipam/vlan_retrieve.html

@@ -0,0 +1,84 @@
+{% extends 'generic/object_retrieve.html' %}
+{% load helpers %}
+
+{% block extra_breadcrumbs %}
+    {% if object.vlan_group %}
+        <li><a href="{% url 'ipam:vlan_list' %}?vlan_group={{ object.vlan_group.name }}">{{ object.vlan_group }}</a></li>
+    {% endif %}
+{% endblock extra_breadcrumbs %}
+
+{% block extra_nav_tabs %}
+        <li role="presentation"{% if active_tab == 'interfaces' %} class="active"{% endif %}>
+            <a href="{% url 'ipam:vlan_interfaces' pk=object.pk %}">Device Interfaces <span class="badge">{{ object.get_interfaces.count }}</span></a>
+        </li>
+        <li role="presentation"{% if active_tab == 'vminterfaces' %} class="active"{% endif %}>
+            <a href="{% url 'ipam:vlan_vminterfaces' pk=object.pk %}">VM Interfaces <span class="badge">{{ object.get_vminterfaces.count }}</span></a>
+        </li>
+{% endblock extra_nav_tabs %}
+
+{% block content_left_page %}
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <strong>VLAN</strong>
+                </div>
+                <table class="table table-hover panel-body attr-table">
+                    <tr>
+                        <td>Locations</td>
+                        <td>
+                            {% for location in object.locations.all %}
+                                {{ location|hyperlinked_object }}<br>
+                            {% empty %}
+                                <span class="text-muted">None</span>
+                            {% endfor %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>VLAN Group</td>
+                        <td>{{ object.vlan_group|hyperlinked_object }}</td>
+                    </tr>
+                    <tr>
+                        <td>VLAN ID</td>
+                        <td>{{ object.vid }}</td>
+                    </tr>
+                    <tr>
+                        <td>Name</td>
+                        <td>{{ object.name }}</td>
+                    </tr>
+                    {% include 'inc/tenant_table_row.html' %}
+                    <tr>
+                        <td>Status</td>
+                        <td>
+                            {{ object.status| hyperlinked_object_with_color }}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Role</td>
+                        <td>{{ object.role | hyperlinked_object_with_color }}</td>
+                    </tr>
+                    <tr>
+                        <td>Description</td>
+                        <td>{{ object.description|placeholder }}</td>
+                    </tr>
+                </table>
+            </div>
+{% endblock content_left_page %}
+
+{% block content_full_width_page %}
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <strong>Prefixes</strong>
+                </div>
+                {% include 'responsive_table.html' with table=prefix_table %}
+                {% if perms.ipam.add_prefix %}
+                    <div class="panel-footer text-right noprint">
+                        <a href="{% url 'ipam:prefix_add' %}?{% if object.tenant %}tenant={{ object.tenant.pk }}{% endif %}&vlan={{ object.pk }}{% for loc in object.locations.all %}&locations={{ loc.pk }}{% endfor %}" class="btn btn-primary btn-xs">
+                            <span class="mdi mdi-plus-thick" aria-hidden="true"></span>
+                            Add a prefix
+                        </a>
+                    </div>
+                {% endif %}
+            </div>
+            {% if prefix_table.paginator.num_pages > 1 %}
+                {% include "inc/paginator.html" with paginator=prefix_table.paginator page=prefix_table.page %}
+            {% endif %}
+{% endblock content_full_width_page %}

nautobot/ipam/templates/ipam/vlan_update.html

@@ -0,0 +1,24 @@
+{% extends 'generic/object_create.html' %}
+{% load form_helpers %}
+
+{% block form %}
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>VLAN</strong></div>
+        <div class="panel-body">
+            {% render_field form.vid %}
+            {% render_field form.name %}
+            {% render_field form.status %}
+            {% render_field form.role %}
+            {% render_field form.description %}
+        </div>
+    </div>
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Assignment</strong></div>
+        <div class="panel-body">
+            {% render_field form.locations %}
+            {% render_field form.vlan_group %}
+        </div>
+    </div>
+    {% include 'inc/tenancy_form_panel.html' %}
+    {% include 'inc/extras_features_edit_form_fields.html' %}
+{% endblock %}

nautobot/ipam/tests/test_views.py

@@ -63,6 +63,11 @@ class NamespaceTestCase(
     ViewTestCases.BulkDeleteObjectsViewTestCase,
 ):
     model = Namespace
+    custom_action_required_permissions = {
+        "ipam:namespace_vrfs": ["ipam.view_namespace", "ipam.view_vrf"],
+        "ipam:namespace_prefixes": ["ipam.view_namespace", "ipam.view_prefix"],
+        "ipam:namespace_ip_addresses": ["ipam.view_namespace", "ipam.view_ipaddress"],
+    }
 
     @classmethod
     def setUpTestData(cls):

nautobot/ipam/urls.py

@@ -7,7 +7,6 @@ from . import views
 from .models import (
     IPAddress,
     Prefix,
-    VLAN,
 )
 
 app_name = "ipam"
@@ -18,6 +17,7 @@ router.register("namespaces", views.NamespaceUIViewSet)
 router.register("rirs", views.RIRUIViewSet)
 router.register("route-targets", views.RouteTargetUIViewSet)
 router.register("services", views.ServiceUIViewSet)
+router.register("vlans", views.VLANUIViewSet)
 router.register("vlan-groups", views.VLANGroupUIViewSet)
 router.register("vrfs", views.VRFUIViewSet)
 
@@ -140,12 +140,6 @@ urlpatterns = [
         name="ipaddress_delete",
     ),
     # VLANs
-    path("vlans/", views.VLANListView.as_view(), name="vlan_list"),
-    path("vlans/add/", views.VLANEditView.as_view(), name="vlan_add"),
-    path("vlans/import/", views.VLANBulkImportView.as_view(), name="vlan_import"),  # 3.0 TODO: remove, unused
-    path("vlans/edit/", views.VLANBulkEditView.as_view(), name="vlan_bulk_edit"),
-    path("vlans/delete/", views.VLANBulkDeleteView.as_view(), name="vlan_bulk_delete"),
-    path("vlans/<uuid:pk>/", views.VLANView.as_view(), name="vlan"),
     path(
         "vlans/<uuid:pk>/interfaces/",
         views.VLANInterfacesView.as_view(),
@@ -156,20 +150,6 @@ urlpatterns = [
         views.VLANVMInterfacesView.as_view(),
         name="vlan_vminterfaces",
     ),
-    path("vlans/<uuid:pk>/edit/", views.VLANEditView.as_view(), name="vlan_edit"),
-    path("vlans/<uuid:pk>/delete/", views.VLANDeleteView.as_view(), name="vlan_delete"),
-    path(
-        "vlans/<uuid:pk>/changelog/",
-        ObjectChangeLogView.as_view(),
-        name="vlan_changelog",
-        kwargs={"model": VLAN},
-    ),
-    path(
-        "vlans/<uuid:pk>/notes/",
-        ObjectNotesView.as_view(),
-        name="vlan_notes",
-        kwargs={"model": VLAN},
-    ),
 ]
 
 urlpatterns += router.urls

nautobot/ipam/views.py

@@ -31,7 +31,7 @@ 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.core.views.viewsets import NautobotUIViewSet
-from nautobot.dcim.models import Device, Interface, Location
+from nautobot.dcim.models import Device, Interface
 from nautobot.extras.models import Role, SavedView, Status, Tag
 from nautobot.ipam import choices, constants
 from nautobot.ipam.api import serializers
@@ -106,7 +106,12 @@ class NamespaceUIViewSet(NautobotUIViewSet):
         context.update({"object_detail_content": self.object_detail_content})
         return context
 
-    @action(detail=True, url_path="vrfs")
+    @action(
+        detail=True,
+        url_path="vrfs",
+        custom_view_base_action="view",
+        custom_view_additional_permissions=["ipam.view_vrf"],
+    )
     def vrfs(self, request, *args, **kwargs):
         instance = self.get_object()
         vrfs = instance.vrfs.restrict(request.user, "view")
@@ -128,7 +133,12 @@ class NamespaceUIViewSet(NautobotUIViewSet):
             }
         )
 
-    @action(detail=True, url_path="prefixes")
+    @action(
+        detail=True,
+        url_path="prefixes",
+        custom_view_base_action="view",
+        custom_view_additional_permissions=["ipam.view_prefix"],
+    )
     def prefixes(self, request, *args, **kwargs):
         instance = self.get_object()
         prefixes = instance.prefixes.restrict(request.user, "view").select_related("status")
@@ -146,7 +156,13 @@ class NamespaceUIViewSet(NautobotUIViewSet):
             }
         )
 
-    @action(detail=True, url_path="ip-addresses", url_name="ip_addresses")
+    @action(
+        detail=True,
+        url_path="ip-addresses",
+        url_name="ip_addresses",
+        custom_view_base_action="view",
+        custom_view_additional_permissions=["ipam.view_ipaddress"],
+    )
     def ip_addresses(self, request, *args, **kwargs):
         instance = self.get_object()
         ip_addresses = instance.ip_addresses.restrict(request.user, "view").select_related("role", "status", "tenant")
@@ -1189,40 +1205,37 @@ class VLANGroupUIViewSet(NautobotUIViewSet):
 #
 
 
-class VLANListView(generic.ObjectListView):
+class VLANUIViewSet(NautobotUIViewSet):  # 3.0 TODO: remove, unused BulkImportView
+    bulk_update_form_class = forms.VLANBulkEditForm
+    filterset_class = filters.VLANFilterSet
+    filterset_form_class = forms.VLANFilterForm
+    form_class = forms.VLANForm
+    serializer_class = serializers.VLANSerializer
+    table_class = tables.VLANTable
     queryset = VLAN.objects.all()
-    filterset = filters.VLANFilterSet
-    filterset_form = forms.VLANFilterForm
-    table = tables.VLANDetailTable
-
-
-class VLANView(generic.ObjectView):
-    queryset = VLAN.objects.annotate(location_count=count_related(Location, "vlans")).select_related(
-        "role",
-        "status",
-        "tenant__tenant_group",
-    )
 
     def get_extra_context(self, request, instance):
-        prefixes = (
-            Prefix.objects.restrict(request.user, "view")
-            .filter(vlan=instance)
-            .select_related(
-                "status",
-                "role",
-                # "vrf",
-                "namespace",
+        context = super().get_extra_context(request, instance)
+        if self.action == "retrieve":
+            prefixes = (
+                Prefix.objects.restrict(request.user, "view")
+                .filter(vlan=instance)
+                .select_related(
+                    "status",
+                    "role",
+                    "namespace",
+                )
             )
-        )
-        prefix_table = tables.PrefixTable(list(prefixes), hide_hierarchy_ui=True, exclude=["vlan"])
+            prefix_table = tables.PrefixTable(list(prefixes), hide_hierarchy_ui=True, exclude=["vlan"])
 
-        paginate = {
-            "paginator_class": EnhancedPaginator,
-            "per_page": get_paginate_count(request),
-        }
-        RequestConfig(request, paginate).configure(prefix_table)
+            paginate = {
+                "paginator_class": EnhancedPaginator,
+                "per_page": get_paginate_count(request),
+            }
+            RequestConfig(request, paginate).configure(prefix_table)
 
-        return {"prefix_table": prefix_table, **super().get_extra_context(request, instance)}
+            context["prefix_table"] = prefix_table
+        return context
 
 
 class VLANInterfacesView(generic.ObjectView):
@@ -1265,44 +1278,6 @@ class VLANVMInterfacesView(generic.ObjectView):
         }
 
 
-class VLANEditView(generic.ObjectEditView):
-    queryset = VLAN.objects.all()
-    model_form = forms.VLANForm
-    template_name = "ipam/vlan_edit.html"
-
-
-class VLANDeleteView(generic.ObjectDeleteView):
-    queryset = VLAN.objects.all()
-
-
-class VLANBulkImportView(generic.BulkImportView):  # 3.0 TODO: remove, unused
-    queryset = VLAN.objects.all()
-    table = tables.VLANTable
-
-
-class VLANBulkEditView(generic.BulkEditView):
-    queryset = VLAN.objects.select_related(
-        "vlan_group",
-        "status",
-        "tenant",
-        "role",
-    )
-    filterset = filters.VLANFilterSet
-    table = tables.VLANTable
-    form = forms.VLANBulkEditForm
-
-
-class VLANBulkDeleteView(generic.BulkDeleteView):
-    queryset = VLAN.objects.select_related(
-        "vlan_group",
-        "status",
-        "tenant",
-        "role",
-    )
-    filterset = filters.VLANFilterSet
-    table = tables.VLANTable
-
-
 #
 # Services
 #

nautobot/project-static/docs/404.html

@@ -3579,6 +3579,29 @@
   
   
   
+    <li class="md-nav__item">
+      <a href="/projects/core/en/stable/user-guide/core-data-model/dcim/modulefamily.html" class="md-nav__link">
+        
+  
+  
+  <span class="md-ellipsis">
+    Module Family
+    
+  </span>
+  
+
+      </a>
+    </li>
+  
+
+              
+            
+              
+                
+  
+  
+  
+  
     
     
     
@@ -3591,7 +3614,7 @@
       
         
         
-        <input class="md-nav__toggle md-toggle " type="checkbox" id="__nav_2_3_4_10" >
+        <input class="md-nav__toggle md-toggle " type="checkbox" id="__nav_2_3_4_11" >
         
           
           <div class="md-nav__link md-nav__container">
@@ -3608,14 +3631,14 @@
             </a>
             
               
-              <label class="md-nav__link " for="__nav_2_3_4_10" id="__nav_2_3_4_10_label" tabindex="0">
+              <label class="md-nav__link " for="__nav_2_3_4_11" id="__nav_2_3_4_11_label" tabindex="0">
                 <span class="md-nav__icon md-icon"></span>
               </label>
             
           </div>
         
-        <nav class="md-nav" data-md-level="4" aria-labelledby="__nav_2_3_4_10_label" aria-expanded="false">
-          <label class="md-nav__title" for="__nav_2_3_4_10">
+        <nav class="md-nav" data-md-level="4" aria-labelledby="__nav_2_3_4_11_label" aria-expanded="false">
+          <label class="md-nav__title" for="__nav_2_3_4_11">
             <span class="md-nav__icon md-icon"></span>
             Module Type
           </label>
@@ -3831,7 +3854,7 @@
       
         
         
-        <input class="md-nav__toggle md-toggle " type="checkbox" id="__nav_2_3_4_11" >
+        <input class="md-nav__toggle md-toggle " type="checkbox" id="__nav_2_3_4_12" >
         
           
           <div class="md-nav__link md-nav__container">
@@ -3848,14 +3871,14 @@
             </a>
             
               
-              <label class="md-nav__link " for="__nav_2_3_4_11" id="__nav_2_3_4_11_label" tabindex="0">
+              <label class="md-nav__link " for="__nav_2_3_4_12" id="__nav_2_3_4_12_label" tabindex="0">
                 <span class="md-nav__icon md-icon"></span>
               </label>
             
           </div>
         
-        <nav class="md-nav" data-md-level="4" aria-labelledby="__nav_2_3_4_11_label" aria-expanded="false">
-          <label class="md-nav__title" for="__nav_2_3_4_11">
+        <nav class="md-nav" data-md-level="4" aria-labelledby="__nav_2_3_4_12_label" aria-expanded="false">
+          <label class="md-nav__title" for="__nav_2_3_4_12">
             <span class="md-nav__icon md-icon"></span>
             Module
           </label>

nautobot/project-static/docs/apps/index.html

@@ -3601,6 +3601,29 @@
   
   
   
+    <li class="md-nav__item">
+      <a href="../user-guide/core-data-model/dcim/modulefamily.html" class="md-nav__link">
+        
+  
+  
+  <span class="md-ellipsis">
+    Module Family
+    
+  </span>
+  
+
+      </a>
+    </li>
+  
+
+              
+            
+              
+                
+  
+  
+  
+  
     
     
     
@@ -3613,7 +3636,7 @@
       
         
         
-        <input class="md-nav__toggle md-toggle " type="checkbox" id="__nav_2_3_4_10" >
+        <input class="md-nav__toggle md-toggle " type="checkbox" id="__nav_2_3_4_11" >
         
           
           <div class="md-nav__link md-nav__container">
@@ -3630,14 +3653,14 @@
             </a>
             
               
-              <label class="md-nav__link " for="__nav_2_3_4_10" id="__nav_2_3_4_10_label" tabindex="0">
+              <label class="md-nav__link " for="__nav_2_3_4_11" id="__nav_2_3_4_11_label" tabindex="0">
                 <span class="md-nav__icon md-icon"></span>
               </label>
             
           </div>
         
-        <nav class="md-nav" data-md-level="4" aria-labelledby="__nav_2_3_4_10_label" aria-expanded="false">
-          <label class="md-nav__title" for="__nav_2_3_4_10">
+        <nav class="md-nav" data-md-level="4" aria-labelledby="__nav_2_3_4_11_label" aria-expanded="false">
+          <label class="md-nav__title" for="__nav_2_3_4_11">
             <span class="md-nav__icon md-icon"></span>
             Module Type
           </label>
@@ -3853,7 +3876,7 @@
       
         
         
-        <input class="md-nav__toggle md-toggle " type="checkbox" id="__nav_2_3_4_11" >
+        <input class="md-nav__toggle md-toggle " type="checkbox" id="__nav_2_3_4_12" >
         
           
           <div class="md-nav__link md-nav__container">
@@ -3870,14 +3893,14 @@
             </a>
             
               
-              <label class="md-nav__link " for="__nav_2_3_4_11" id="__nav_2_3_4_11_label" tabindex="0">
+              <label class="md-nav__link " for="__nav_2_3_4_12" id="__nav_2_3_4_12_label" tabindex="0">
                 <span class="md-nav__icon md-icon"></span>
               </label>
             
           </div>
         
-        <nav class="md-nav" data-md-level="4" aria-labelledby="__nav_2_3_4_11_label" aria-expanded="false">
-          <label class="md-nav__title" for="__nav_2_3_4_11">
+        <nav class="md-nav" data-md-level="4" aria-labelledby="__nav_2_3_4_12_label" aria-expanded="false">
+          <label class="md-nav__title" for="__nav_2_3_4_12">
             <span class="md-nav__icon md-icon"></span>
             Module
           </label>