nautobot 2.4.21__py3-none-any.whl → 3.0.0a3__py3-none-any.whl

nautobot/ipam/tables.py

@@ -36,7 +36,7 @@ from .models import (
     VRFPrefixAssignment,
 )
 
-AVAILABLE_LABEL = mark_safe('<span class="label label-success">Available</span>')
+AVAILABLE_LABEL = mark_safe('<span class="badge bg-success">Available</span>')
 
 UTILIZATION_GRAPH = """
 {% load helpers %}
@@ -51,7 +51,7 @@ PREFIX_COPY_LINK = """
 {% if not table.hide_hierarchy_ui %}
 {% tree_hierarchy_ui_representation record.ancestors.count|as_range table.hide_hierarchy_ui base_tree_depth|default:0 %}
 {% endif %}
-<span class="hover_copy">
+<span>
   <a href="\
 {% if record.present_in_database %}\
 {% url 'ipam:prefix' pk=record.pk %}\
@@ -62,8 +62,9 @@ PREFIX_COPY_LINK = """
 {% if object.tenant %}&tenant_group={{ object.tenant.tenant_group.pk }}&tenant={{ object.tenant.pk }}{% endif %}\
 {% endif %}\
 " id="copy_{{record.id}}">{{ record.prefix }}</a>
-  <button type="button" class="btn btn-inline btn-default hover_copy_button" data-clipboard-target="#copy_{{record.id}}">
-    <span class="mdi mdi-content-copy"></span>
+  <button type="button" class="btn btn-secondary nb-btn-inline-hover" data-clipboard-target="#copy_{{record.id}}">
+    <span aria-hidden="true" class="mdi mdi-content-copy"></span>
+    <span class="visually-hidden">Copy</span>
   </button>
 </span>
 """
@@ -94,11 +95,12 @@ IPADDRESS_LINK = """
 
 IPADDRESS_COPY_LINK = """
 {% if record.present_in_database %}
-    <span class="hover_copy">
+    <span>
         <a href="{{ record.get_absolute_url }}" id="copy_{{record.id}}">
             {{ record.address }}</a>
-        <button type="button" class="btn btn-inline btn-default hover_copy_button" data-clipboard-target="#copy_{{record.id}}">
-            <span class="mdi mdi-content-copy"></span>
+        <button type="button" class="btn btn-secondary nb-btn-inline-hover" data-clipboard-target="#copy_{{record.id}}">
+            <span aria-hidden="true" class="mdi mdi-content-copy"></span>
+            <span class="visually-hidden">Copy</span>
         </button>
     </span>
 {% elif perms.ipam.add_ipaddress %}
@@ -124,7 +126,7 @@ vminterface={{ request.GET.vminterface }}{% endif %}\
 """
 
 IPADDRESS_ASSIGN_COPY_LINK = """
-<span class="hover_copy">
+<span>
 <a href="\
 {% url 'ipam:ipaddress_edit' pk=record.pk %}\
 ?{% if request.GET.interface %}\
@@ -134,8 +136,9 @@ vminterface={{ request.GET.vminterface }}\
 {% endif %}\
 &return_url={{ request.GET.return_url }}" id="copy_{{record.pk}}">\
 {{ record }}\
-</a><button type="button" class="btn btn-inline btn-default hover_copy_button" data-clipboard-target="#copy_{{record.pk}}">
-    <span class="mdi mdi-content-copy"></span>
+</a><button type="button" class="btn btn-secondary nb-btn-inline-hover" data-clipboard-target="#copy_{{record.pk}}">
+    <span aria-hidden="true" class="mdi mdi-content-copy"></span>
+    <span class="visually-hidden">Copy</span>
 </button>
 </span>
 """
@@ -202,11 +205,12 @@ VLANGROUP_ADD_VLAN = """
 class NamespaceTable(BaseTable):
     pk = ToggleColumn()
     name = tables.LinkColumn()
+    tenant = TenantColumn()
     tags = TagColumn(url_name="ipam:namespace_list")
 
     class Meta(BaseTable.Meta):
         model = Namespace
-        fields = ("pk", "name", "description", "location")
+        fields = ("pk", "name", "description", "tenant", "location")
 
 
 #
@@ -366,7 +370,7 @@ class PrefixTable(StatusTableMixin, RoleTableMixin, BaseTable):
     tenant = TenantColumn()
     namespace = tables.Column(linkify=True)
     vlan = tables.Column(linkify=True, verbose_name="VLAN")
-    rir = tables.Column(linkify=True)
+    rir = tables.Column(linkify=True, verbose_name="RIR")
     children = tables.Column(accessor="descendants_count", orderable=False)
     date_allocated = tables.DateTimeColumn()
     location_count = LinkedCountColumn(
@@ -412,7 +416,7 @@ class PrefixTable(StatusTableMixin, RoleTableMixin, BaseTable):
             "actions",
         )
         row_attrs = {
-            "class": lambda record: "success" if not record.present_in_database else "",
+            "class": lambda record: "table-success" if not record.present_in_database else "",
         }
 
 
@@ -446,6 +450,7 @@ class PrefixDetailTable(PrefixTable):
             "role",
             "description",
             "tags",
+            "actions",
         )
         default_columns = (
             "pk",
@@ -455,12 +460,12 @@ class PrefixDetailTable(PrefixTable):
             "status",
             "children",
             "vrf_count",
-            "utilization",
             "tenant",
             "location_count",
             "vlan",
             "role",
             "description",
+            "actions",
         )
 
 
@@ -497,6 +502,7 @@ class IPAddressTable(StatusTableMixin, RoleTableMixin, BaseTable):
         distinct=True,
         verbose_name="Virtual Machines",
     )
+    actions = ButtonsColumn(Prefix)
 
     class Meta(BaseTable.Meta):
         model = IPAddress
@@ -514,9 +520,10 @@ class IPAddressTable(StatusTableMixin, RoleTableMixin, BaseTable):
             "interface_parent_count",
             "vm_interface_count",
             "vm_interface_parent_count",
+            "actions",
         )
         row_attrs = {
-            "class": lambda record: "success" if not isinstance(record, IPAddress) else "",
+            "class": lambda record: "table-success" if not isinstance(record, IPAddress) else "",
         }
 
 
@@ -543,6 +550,7 @@ class IPAddressDetailTable(IPAddressTable):
             "dns_name",
             "description",
             "tags",
+            "actions",
         )
         default_columns = (
             "pk",
@@ -555,6 +563,7 @@ class IPAddressDetailTable(IPAddressTable):
             "assigned",
             "dns_name",
             "description",
+            "actions",
         )
 
 
@@ -649,7 +658,7 @@ class IPAddressInterfaceTable(InterfaceTable):
             "connection",
         ]
         row_attrs = {
-            "style": cable_status_color_css,
+            "class": cable_status_color_css,
             "data-name": lambda record: record.name,
         }
 
@@ -742,7 +751,7 @@ class VLANTable(StatusTableMixin, RoleTableMixin, BaseTable):
             "description",
         )
         row_attrs = {
-            "class": lambda record: "success" if not isinstance(record, VLAN) else "",
+            "class": lambda record: "table-success" if not isinstance(record, VLAN) else "",
         }
 
 

nautobot/ipam/templates/ipam/inc/ipadress_edit_header.html

@@ -1,16 +1,16 @@
 {% load helpers %}
 
 <ul class="nav nav-tabs" style="margin-bottom: 20px">
-    <li role="presentation"{% if active_tab == 'add' %} class="active"{% endif %}>
-        <a href="{% url 'ipam:ipaddress_add' %}{% legacy_querystring request %}">New IP</a>
+    <li class="nav-item" role="presentation">
+        <a class="nav-link{% if active_tab == 'add' %} active{% endif %}" href="{% url 'ipam:ipaddress_add' %}{% legacy_querystring request %}">New IP</a>
     </li>
     {% if 'interface' in request.GET or 'vminterface' in request.GET %}
-        <li role="presentation"{% if active_tab == 'assign' %} class="active"{% endif %}>
-            <a href="{% url 'ipam:ipaddress_assign' %}{% legacy_querystring request %}">Assign IP</a>
+        <li class="nav-item" role="presentation">
+            <a class="nav-link{% if active_tab == 'assign' %} active{% endif %}" href="{% url 'ipam:ipaddress_assign' %}{% legacy_querystring request %}">Assign IP</a>
         </li>
     {% else %}
-        <li role="presentation"{% if active_tab == 'bulk_add' %} class="active"{% endif %}>
-            <a href="{% url 'ipam:ipaddress_bulk_add' %}{% legacy_querystring request %}">Bulk Create</a>
+        <li class="nav-item" role="presentation">
+            <a class="nav-link{% if active_tab == 'bulk_add' %} active{% endif %}" href="{% url 'ipam:ipaddress_bulk_add' %}{% legacy_querystring request %}">Bulk Create</a>
         </li>
     {% endif %}
 </ul>

nautobot/ipam/templates/ipam/inc/service.html

@@ -7,22 +7,22 @@
         {% for ip in service.ip_addresses.all %}
             {{ ip|hyperlinked_object }}<br>
         {% empty %}
-            <span class="text-muted">All IPs</span>
+            <span class="text-secondary">All IPs</span>
         {% endfor %}
     </td>
     <td>{{ service.description }}</td>
-    <td class="text-right noprint">
-        <a href="{% url 'ipam:service_changelog' pk=service.pk %}" class="btn btn-default btn-xs" title="Change log">
-            <i class="mdi mdi-history"></i>
+    <td class="text-end d-print-none">
+        <a href="{% url 'ipam:service_changelog' pk=service.pk %}" class="btn btn-secondary btn-sm" title="Change log">
+            <span class="mdi mdi-history"></span>
         </a>
         {% if perms.ipam.change_service %}
-            <a href="{% url 'ipam:service_edit' pk=service.pk %}?return_url={{ service.parent.get_absolute_url }}" class="btn btn-info btn-xs" title="Edit service">
-                <i class="mdi mdi-pencil"></i>
+            <a href="{% url 'ipam:service_edit' pk=service.pk %}?return_url={{ service.parent.get_absolute_url }}" class="btn btn-info btn-sm" title="Edit service">
+                <span class="mdi mdi-pencil"></span>
             </a>
         {% endif %}
         {% if perms.ipam.delete_service %}
-            <a href="{% url 'ipam:service_delete' pk=service.pk %}?return_url={{ service.parent.get_absolute_url }}" class="btn btn-danger btn-xs">
-                <i class="mdi mdi-trash-can-outline" title="Delete service"></i>
+            <a href="{% url 'ipam:service_delete' pk=service.pk %}?return_url={{ service.parent.get_absolute_url }}" class="btn btn-danger btn-sm">
+                <span class="mdi mdi-trash-can-outline" title="Delete service"></span>
             </a>
         {% endif %}
     </td>

nautobot/ipam/templates/ipam/inc/toggle_available.html

@@ -1,11 +1,11 @@
 {% load helpers %}
-{% if show_available is not None %}
-    <div class="btn-group" role="group">
-        <a href="{{ request.path }}{% legacy_querystring request show_available='true' %}" class="btn btn-default btn-xs{% if show_available %} active disabled{% endif %}">
-            <i class="mdi mdi-eye-outline"></i> Show available
-        </a>
-        <a href="{{ request.path }}{% legacy_querystring request show_available='false' %}" class="btn btn-default btn-xs{% if not show_available %} active disabled{% endif %}">
-            <i class="mdi mdi-eye-off-outline"></i> Hide available
-        </a>
-    </div>
-{% endif %}
+<div class="btn-group" role="group">
+    <a href="{% django_querystring show_available='true' %}"
+       class="btn btn-primary{% if show_available %} bg-primary nb-text-body-bg{% endif %}">
+        <span class="mdi mdi-eye-outline"></span> Show {{ label }}
+    </a>
+    <a href="{% django_querystring show_available='false' %}"
+       class="btn btn-primary{% if not show_available %} bg-primary nb-text-body-bg{% endif %}">
+        <span class="mdi mdi-eye-off-outline"></span> Hide {{ label }}
+    </a>
+</div>

nautobot/ipam/templates/ipam/inc/vlangroup_header.html

@@ -1,7 +1,8 @@
-<div class="pull-right">
+{# TODO: this file is unused as far as I can tell - remove it? #}
+<div class="float-end">
     {% if perms.ipam.add_vlan and first_available_vlan %}
         <a href="{% url 'ipam:vlan_add' %}?vid={{ first_available_vlan }}&group={{ object.pk }}{% if object.location %}&location={{ object.location.pk }}{% endif %}" class="btn btn-success">
-            <i class="mdi mdi-plus-thick" aria-hidden="true"></i> Add a VLAN
+            <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add a VLAN
         </a>
     {% endif %}
     {% if perms.ipam.change_vlangroup %}

nautobot/ipam/templates/ipam/ipaddress.html

@@ -5,26 +5,26 @@
 {% block extra_nav_tabs %}
     {% with interface_count=object.interfaces.count %}
         {% if interface_count %}
-            <li role="presentation" {% if active_tab == 'interfaces' %} class="active"{% endif %}>
-                <a href="{% url 'ipam:ipaddress_interfaces' pk=object.pk %}">Interfaces {% badge interface_count %}</a>
+            <li class="nav-item" role="presentation">
+                <a href="{% url 'ipam:ipaddress_interfaces' pk=object.pk %}" class="nav-link{% if active_tab == 'interfaces' %} active{% endif %}">Interfaces {% badge interface_count %}</a>
             </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 class="nav-item" role="presentation">
+                <a href="{% url 'ipam:ipaddress_vm_interfaces' pk=object.pk %}" class="nav-link{% if active_tab == 'vm_interfaces' %} active{% endif %}">VM Interfaces {% badge vm_interface_count %}</a>
             </li>
         {% endif %}
     {% endwith %}
 {% endblock extra_nav_tabs %}
 
 {% block content_left_page %}
-    <div class="panel panel-default">
-        <div class="panel-heading">
+    <div class="card">
+        <div class="card-header">
             <strong>IP Address</strong>
         </div>
-        <table class="table table-hover panel-body attr-table">
+        <table class="table table-hover card-body attr-table">
             <tr>
                 <td>Namespace</td>
                 <td>{{ object.parent.namespace|hyperlinked_object }}</td>
@@ -74,11 +74,11 @@
 {% endblock content_left_page %}
 
 {% block content_right_page %}
-    <div class="panel panel-default">
-        <div class="panel-heading">
+    <div class="card">
+        <div class="card-header">
             <strong>Operational Details</strong>
         </div>
-        <table class="table table-hover panel-body attr-table">
+        <table class="table table-hover card-body attr-table">
             {% include 'inc/tenant_table_row.html' %}
             <tr>
                 <td>Assignment</td>
@@ -89,7 +89,7 @@
                         {% 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>
+                            <span class="text-secondary">&mdash;</span>
                         {% else %}
                             {% if interface_count > 0 %}
                                 <a href="{% url 'ipam:ipaddress_interfaces' pk=object.pk %}">
@@ -118,7 +118,7 @@
                             ({{ object.nat_inside.assigned_object.parent|hyperlinked_object }})
                         {% endif %}
                     {% else %}
-                        <span class="text-muted">None</span>
+                        <span class="text-secondary">None</span>
                     {% endif %}
                 </td>
             </tr>
@@ -132,7 +132,21 @@
                             {% endfor %}
                         </ul>
                     {% else %}
-                        <span class="text-muted">None</span>
+                        <span class="text-secondary">None</span>
+                    {% endif %}
+                </td>
+            </tr>
+            <tr>
+                <td>VPN Endpoints</td>
+                <td>
+                    {% if object.vpn_tunnel_endpoints_src_ip.exists %}
+                        <ul class="list-unstyled">
+                            {% for endpoint in object.vpn_tunnel_endpoints_src_ip.all %}
+                                <li>{{ endpoint|hyperlinked_object }}</li>
+                            {% endfor %}
+                        </ul>
+                    {% else %}
+                        <span class="text-secondary">None</span>
                     {% endif %}
                 </td>
             </tr>

nautobot/ipam/templates/ipam/ipaddress_assign.html

@@ -6,7 +6,7 @@
 {% block title %}Assign an IP address{% endblock %}
 
 {% block content %}
-    <form action="#" method="get" class="form form-horizontal">
+    <form action="#" method="get">
         {% for field in form.hidden_fields %}
             {{ field }}
         {% endfor %}
@@ -18,50 +18,57 @@
             {% endif %}
         {% endfor %}
         <div class="row">
-            <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
-                <h3>Assign an IP Address</h3>
+            <div class="col-lg-8 offset-lg-2 col-md-10 offset-md-1">
+                <h3 class="mb-16">Assign an IP Address</h3>
                 {% include 'ipam/inc/ipadress_edit_header.html' with active_tab='assign' %}
                 {% if form.non_field_errors %}
-                    <div class="panel panel-danger">
-                        <div class="panel-heading"><strong>Errors</strong></div>
-                        <div class="panel-body">
+                    <div class="card border-danger">
+                        <div class="card-header bg-danger-subtle border-danger text-body">
+                            <strong>Errors</strong>
+                        </div>
+                        <div class="card-body">
                             {{ form.non_field_errors }}
                         </div>
                     </div>
                 {% endif %}
-                <div class="panel panel-default">
-                    <div class="panel-heading"><strong>Select IP Address</strong></div>
-                    <div class="panel-body">
+                <div class="card">
+                    <div class="card-header"><strong>Select IP Address</strong></div>
+                    <div class="card-body">
                         {% render_field form.q %}
                     </div>
                 </div>
             </div>
         </div>
-        <div class="row">
-            <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1 text-right">
-                <button type="submit" class="btn btn-primary">Search</button>
-                <a href="{{ return_url }}" class="btn btn-default">Cancel</a>
-            </div>
+        <div class="col-lg-8 offset-lg-2 col-md-10 offset-md-1 gap-8 hstack justify-content-center">
+            <button type="submit" class="btn btn-primary">
+                <span aria-hidden="true" class="mdi mdi-magnify me-4"></span><!--
+                -->Search
+            </button>
+            <a href="{{ return_url }}" class="btn btn-secondary">
+                <span aria-hidden="true" class="mdi mdi-close me-4"></span><!--
+                -->Cancel
+            </a>
         </div>
     </form>
     {% if table %}
-        <div class="row">
-            <form action="{% legacy_querystring request %}" method="post" class="form form-horizontal">
-                {% csrf_token %}
-                <div class="col-md-12" style="margin-top: 20px">
-                    <h3>Search Results</h3>
+        <form action="{% legacy_querystring request %}" method="post">
+            {% csrf_token %}
+            <div class="row">
+                <div class="col-md-12">
+                    <h3 class="my-16">Search Results</h3>
                     {% include 'utilities/obj_table.html' with table_template='panel_table.html' disable_pagination=True %}
-                    <div class="pull-left noprint">
+                    <div class="d-print-none mt-16 text-center">
                         {% if perms.dcim.change_interface %}
                             <button type="submit" name="_edit" formaction="#" class="btn btn-primary btn-sm">
-                                <span class="mdi mdi-clipboard-tick" aria-hidden="true"></span> Assign Selected IPAddresses to Interface
+                                <span class="mdi mdi-check me-4" aria-hidden="true"></span><!--
+                                -->Assign Selected IP Addresses to Interface
                             </button>
                         {% endif %}
                     </div>
                 </div>
-            </form>
-            {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}
-        </div>
+            </div>
+        </form>
+        {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}
     {% endif %}
 {% endblock %}
 

nautobot/ipam/templates/ipam/ipaddress_bulk_add.html

@@ -9,9 +9,9 @@
 {% endblock %}
 
 {% block form %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>IP Addresses</strong></div>
-        <div class="panel-body">
+    <div class="card">
+        <div class="card-header"><strong>IP Addresses</strong></div>
+        <div class="card-body">
             {% render_field form.pattern %}
             {% render_field model_form.namespace %}
             {% render_field model_form.type %}

nautobot/ipam/templates/ipam/ipaddress_edit.html

@@ -10,9 +10,9 @@
 {% endblock %}
 
 {% block form %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>IP Address</strong></div>
-        <div class="panel-body">
+    <div class="card">
+        <div class="card-header"><strong>IP Address</strong></div>
+        <div class="card-body">
             {% render_field form.address %}
             {% render_field form.namespace %}
             {% render_field form.type %}
@@ -23,13 +23,13 @@
         </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">
+    <div class="card">
+        <div class="card-header"><strong>NAT IP (Inside)</strong></div>
+        <div class="card-body">
             <ul class="nav nav-tabs" role="tablist">
-                <li role="presentation" class="active"><a href="#by_device" aria-controls="home" role="tab" data-toggle="tab">By Device</a></li>
-                <li role="presentation"><a href="#by_vm" aria-controls="search" role="tab" data-toggle="tab">By VM</a></li>
-                <li role="presentation"><a href="#by_vrf" aria-controls="search" role="tab" data-toggle="tab">By IP</a></li>
+                <li role="presentation" class="nav-item"><a class="nav-link active" href="#by_device" aria-controls="home" role="tab" data-bs-toggle="tab">By Device</a></li>
+                <li class="nav-item" role="presentation"><a class="nav-link" href="#by_vm" aria-controls="search" role="tab" data-bs-toggle="tab">By VM</a></li>
+                <li class="nav-item" role="presentation"><a class="nav-link" href="#by_vrf" aria-controls="search" role="tab" data-bs-toggle="tab">By IP</a></li>
             </ul>
             <div class="tab-content">
                 <div class="tab-pane active" id="by_device">

nautobot/ipam/templates/ipam/ipaddress_interfaces.html

@@ -3,18 +3,17 @@
 {% load render_table from django_tables2 %}
 {% load static %}
 
+{% block drawer %}
+    {% table_config_form interface_table %}
+{% endblock %}
+
 {% block content %}
     <form method="post">
         {% csrf_token %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
+        <div class="card">
+            <div class="card-header">
                 <strong>Interfaces</strong>
-                <div class="pull-right noprint">
-                    {% if request.user.is_authenticated %}
-                        {% table_config_button_small interface_table %}
-                    {% endif %}
-                </div>
-                <div class="pull-right col-md-2 noprint">
+                <div class="float-end col-lg-2 d-print-none">
                     <input class="form-control interface-filter" type="text" placeholder="Filter" title="Filter text (regular expressions supported)" style="height: 23px" />
                 </div>
             </div>
@@ -24,7 +23,6 @@
     {% if interface_table.paginator.num_pages > 1 %}
         {% include "inc/paginator.html" with paginator=interface_table.paginator page=interface_table.page %}
     {% endif %}
-    {% table_config_form interface_table %}
 {% endblock content %}
 
 {% block javascript %}