nautobot 3.0.0a2__py3-none-any.whl → 3.0.0rc1__py3-none-any.whl

nautobot/extras/templates/extras/objectchange_retrieve.html

@@ -2,38 +2,6 @@
 {% load helpers %}
 {% load static %}
 
-{% block title %}{{ object }} - Change Log{% endblock %}
-
-{% block header %}
-    <div class="row d-print-none">
-        <div class="col-md-8 col-lg-9">
-            <ol class="breadcrumb">
-                <li class="breadcrumb-item"><a href="{% url 'extras:objectchange_list' %}">Change Log</a></li>
-                {% if object.related_object.get_absolute_url %}
-                    <li class="breadcrumb-item"><a href="{{ object.related_object.get_absolute_url }}changelog/">{{ object.related_object }}</a></li>
-                {% elif object.changed_object and object.changed_object.get_absolute_url %}
-                    <li class="breadcrumb-item"><a href="{{ object.changed_object.get_absolute_url }}changelog/">{{ object.changed_object }}</a></li>
-                {% elif object.changed_object is not None %}
-                    <li class="breadcrumb-item">{{ object.changed_object }}</li>
-                {% endif %}
-                <li class="breadcrumb-item">{{ object }}</li>
-            </ol>
-        </div>
-        <div class="col-md-4 col-lg-3">
-            <form action="{% url 'extras:objectchange_list' %}" method="get">
-                <div class="input-group">
-                    <input type="text" name="q" class="form-control" placeholder="Search change logs" />
-                    <span class="input-group-btn">
-                        <button type="submit" class="btn btn-primary">
-                            <span class="mdi mdi-magnify" aria-hidden="true"></span>
-                        </button>
-                    </span>
-                </div>
-            </form>
-        </div>
-    </div>
-{% endblock %}
-
 {% block content %}
     <div class="row">
         <div class="col-lg-5">
@@ -113,13 +81,25 @@
             <div class="card">
                 <div class="card-header">
                     <strong>Difference</strong>
-                    <div class="btn-group btn-group-xs float-end d-print-none">
-                        <a {% if prev_change %}href="{% url 'extras:objectchange' pk=prev_change.pk %}"{% else %}disabled{% endif %} class="btn btn-secondary">
-                            <span class="mdi mdi-chevron-left" aria-hidden="true"></span> Previous
-                        </a>
-                        <a {% if next_change %}href="{% url 'extras:objectchange' pk=next_change.pk %}"{% else %}disabled{% endif %} class="btn btn-secondary">
-                            Next <span class="mdi mdi-chevron-right" aria-hidden="true"></span>
-                        </a>
+                    <div class="btn-group btn-group-sm float-end d-print-none" role="group">
+                        {% if prev_change %}
+                            <a href="{% url 'extras:objectchange' pk=prev_change.pk %}" class="btn btn-secondary">
+                                <span class="mdi mdi-chevron-left" aria-hidden="true"></span> Previous
+                            </a>
+                        {% else %}
+                            <a aria-disabled="true" class="btn btn-secondary disabled">
+                                <span class="mdi mdi-chevron-left" aria-hidden="true"></span> Previous
+                            </a>
+                        {% endif %}
+                        {% if next_change %}
+                            <a href="{% url 'extras:objectchange' pk=next_change.pk %}" class="btn btn-secondary">
+                                Next <span class="mdi mdi-chevron-right" aria-hidden="true"></span>
+                            </a>
+                        {% else %}
+                            <a aria-disabled="true" class="btn btn-secondary disabled">
+                                Next <span class="mdi mdi-chevron-right" aria-hidden="true"></span>
+                            </a>
+                        {% endif %}
                     </div>
                 </div>
                 <div class="card-body">

nautobot/extras/templates/extras/plugin_detail.html

@@ -4,29 +4,34 @@
 
 {% block breadcrumbs_wrapper %}{% render_breadcrumbs %}{% endblock breadcrumbs_wrapper %}
 
-{% block header %}
-    <div class="float-end d-print-none">
-        {% block buttons %}
-            {% if app_data.home_url %}
-                <a href="{% url app_data.home_url %}" class="btn btn-primary">
-                    <span class="mdi mdi-home"></span> App Home
-                </a>
-            {% endif %}
-            {% if app_data.config_url %}
-                <a href="{% url app_data.config_url %}" class="btn btn-warning">
-                    <span class="mdi mdi-cog"></span> App Configuration
-                </a>
-            {% endif %}
-            {% if app_data.docs_url %}
-                <a href="{% url app_data.docs_url %}" class="btn btn-info">
-                    <span class="mdi mdi-cog"></span> App Documentation
-                </a>
-            {% endif %}
-        {% endblock buttons %}
-    </div>
-{% endblock header %}
+{% block header %}{% endblock header %}
 
 {% block content %}
+
+    <div class="row d-print-none mb-16">
+        <div class="col-lg-12">
+            <div class="float-end d-print-none">
+                {% block buttons %}
+                    {% if app_data.home_url %}
+                        <a href="{% url app_data.home_url %}" class="btn btn-primary">
+                            <span class="mdi mdi-home"></span> App Home
+                        </a>
+                    {% endif %}
+                    {% if app_data.config_url %}
+                        <a href="{% url app_data.config_url %}" class="btn btn-warning">
+                            <span class="mdi mdi-cog"></span> App Configuration
+                        </a>
+                    {% endif %}
+                    {% if app_data.docs_url %}
+                        <a href="{% url app_data.docs_url %}" class="btn btn-info">
+                            <span class="mdi mdi-cog"></span> App Documentation
+                        </a>
+                    {% endif %}
+                {% endblock buttons %}
+            </div>
+        </div>
+    </div>
+
     <div class="row">
         <div class="col-lg-6">
             {% block content_left_page %}
@@ -65,7 +70,7 @@
                         {% if app_data.availability %}
                             <tr>
                                 <td>License</td>
-                                <td><label class="badge bg-transparent">{{ app_data.availability }}</label></td>
+                                <td><label class="badge border border-primary text-primary">{{ app_data.availability }}</label></td>
                             </tr>
                         {% endif %}
                     </table>
@@ -77,11 +82,11 @@
                     <table class="table table-hover card-body attr-table">
                         <tr>
                             <td>Min Nautobot Version</td>
-                            <td>v{{ object.min_version | placeholder }}</td>
+                            <td>{% if object.min_version %}v{{ object.min_version }}{% else %}{{ None|placeholder }}{% endif %}</td>
                         </tr>
                         <tr>
                             <td>Max Nautobot Version</td>
-                            <td>v{{ object.max_version | placeholder }}</td>
+                            <td>{% if object.max_version %}v{{ object.max_version }}{% else %}{{ None|placeholder }}{% endif %}</td>
                         </tr>
                     </table>
                 </div>

nautobot/extras/templates/extras/plugins_list.html

@@ -8,27 +8,26 @@
 {% endblock %}
 
 {% block content %}
-    <div class="row d-print-none">
+    <div class="row d-print-none mb-16">
         <div class="col-lg-12">
-            {% render_breadcrumbs %}
-        </div>
-    </div>
+            <div class="float-end d-print-none">
+                <div class="btn-group" role="group">
+                    <a href="{% django_querystring display='list' %}"
+                       class="btn btn-primary{% if display == 'list' %} bg-primary nb-text-body-bg{% endif %}">
+                        <span class="mdi mdi-view-sequential" aria-hidden="true"></span> List
+                    </a>
+                    {# djlint:off B123 #}
+                    <a href="{% django_querystring display='tiles' %}"
+                       class="btn btn-primary{% if display == 'tiles' %} bg-primary nb-text-body-bg{% endif %}">
+                        <span class="mdi mdi-view-grid" aria-hidden="true"></span> Tiles
+                    </a>
+                    {# djlint:on B123 #}
+                </div>
 
-    <div class="float-end d-print-none">
-        <div class="btn-group">
-            <a class="btn btn-secondary set-apps-display" data-display="tiles" href="" title="Tiles">
-                <span class="mdi mdi-view-grid{% if display == "list" %}-outline{% endif %}"></span>
-            </a>
-            <a class="btn btn-secondary set-apps-display" data-display="list" href="" title="List">
-                <span class="mdi mdi-view-sequential{% if display == "tiles" %}-outline{% endif %}"></span>
-            </a>
+                <a class="btn btn-primary" href="{% url 'apps:apps_marketplace' %}">Visit Apps Marketplace</a>
+            </div>
         </div>
-
-        <a class="btn btn-primary" href="{% url 'apps:apps_marketplace' %}">Visit Apps Marketplace</a>
     </div>
-
-    <h1>{% block page_heading %}{% render_title %}{% endblock %}</h1>
-
     <div class="row">
         <div class="col-lg-12">
             {% if filter_form %}
@@ -47,13 +46,4 @@
 {% block javascript %}
     {{ block.super }}
     <script src="{% static 'js/tableconfig.js' %}"></script>
-
-    <script>
-    // Set display anchor links without losing other potentially active query params such as applied filters.
-        [...document.querySelectorAll('.set-apps-display')].forEach(button => {
-            const queryParams = new URLSearchParams(window.location.search);
-            queryParams.set('display', button.dataset.display);
-            button.setAttribute('href', `?${queryParams.toString()}`);
-        });
-    </script>
 {% endblock %}

nautobot/extras/templates/extras/role_retrieve.html

@@ -223,4 +223,68 @@
         </div>
         {% include 'inc/paginator.html' with paginator=vdc_table.paginator page=vdc_table.page %}
     {% endif %}
+    {% if vpn_table %}
+        <div class="card">
+            <div class="card-header">
+                <strong>VPNs</strong>
+            </div>
+            {% include 'inc/table.html' with table=vpn_table %}
+            {% if perms.vpn.add_vpn %}
+                <div class="card-footer text-end d-print-none">
+                    <a href="{% url 'vpn:vpn_add' %}?role={{ object.pk }}" class="btn btn-sm btn-primary">
+                        <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add VPN
+                    </a>
+                </div>
+            {% endif %}
+        </div>
+        {% include 'inc/paginator.html' with paginator=vpn_table.paginator page=vpn_table.page %}
+    {% endif %}
+    {% if vpn_profile_table %}
+        <div class="card">
+            <div class="card-header">
+                <strong>VPN Profiles</strong>
+            </div>
+            {% include 'inc/table.html' with table=vpn_profile_table %}
+            {% if perms.vpn.add_vpnprofile %}
+                <div class="card-footer text-end d-print-none">
+                    <a href="{% url 'vpn:vpnprofile_add' %}?role={{ object.pk }}" class="btn btn-sm btn-primary">
+                        <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add VPN Profile
+                    </a>
+                </div>
+            {% endif %}
+        </div>
+        {% include 'inc/paginator.html' with paginator=vpn_profile_table.paginator page=vpn_profile_table.page %}
+    {% endif %}
+    {% if vpn_tunnel_table %}
+        <div class="card">
+            <div class="card-header">
+                <strong>VPN Tunnels</strong>
+            </div>
+            {% include 'inc/table.html' with table=vpn_tunnel_table %}
+            {% if perms.vpn.add_vpntunnel %}
+                <div class="card-footer text-end d-print-none">
+                    <a href="{% url 'vpn:vpntunnel_add' %}?role={{ object.pk }}" class="btn btn-sm btn-primary">
+                        <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add VPN Tunnel
+                    </a>
+                </div>
+            {% endif %}
+        </div>
+        {% include 'inc/paginator.html' with paginator=vpn_tunnel_table.paginator page=vpn_tunnel_table.page %}
+    {% endif %}
+    {% if vpn_tunnel_endpoint_table %}
+        <div class="card">
+            <div class="card-header">
+                <strong>VPN Tunnel Endpoints</strong>
+            </div>
+            {% include 'inc/table.html' with table=vpn_tunnel_endpoint_table %}
+            {% if perms.vpn.add_vpntunnelendpoint %}
+                <div class="card-footer text-end d-print-none">
+                    <a href="{% url 'vpn:vpntunnelendpoint_add' %}?role={{ object.pk }}" class="btn btn-sm btn-primary">
+                        <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add VPN Tunnel Endpoint
+                    </a>
+                </div>
+            {% endif %}
+        </div>
+        {% include 'inc/paginator.html' with paginator=vpn_tunnel_endpoint_table.paginator page=vpn_tunnel_endpoint_table.page %}
+    {% endif %}
 {% endblock content_full_width_page %}

nautobot/extras/templates/extras/scheduledjob.html

@@ -102,7 +102,8 @@
                 <td>
                     {{ object.start_time|timezone:object.time_zone|date:settings.SHORT_DATETIME_FORMAT }}
                     {% if default_time_zone != object.time_zone %}
-                        <br>{{ object.start_time|timezone:default_time_zone|date:settings.SHORT_DATETIME_FORMAT }}
+                        {{ object.time_zone }}
+                        <br>{{ object.start_time|timezone:default_time_zone|date:settings.SHORT_DATETIME_FORMAT }} {{ default_time_zone }}
                     {% endif %}
                 </td>
             </tr>
@@ -112,7 +113,8 @@
                     {% if object.last_run_at %}
                         {{ object.last_run_at|timezone:object.time_zone|date:settings.SHORT_DATETIME_FORMAT }}
                         {% if default_time_zone != object.time_zone %}
-                            <br>{{ object.last_run_at|timezone:default_time_zone|date:SHORT_DATETIME_FORMAT }}
+                            {{ object.time_zone }}
+                            <br>{{ object.last_run_at|timezone:default_time_zone|date:settings.SHORT_DATETIME_FORMAT }} {{ default_time_zone }}
                         {% endif %}
                     {% else %}
                         {{ object.last_run_at|placeholder }}

nautobot/extras/templates/extras/secret_create.html

@@ -13,7 +13,7 @@
     <div class="card">
         <div class="card-header"><strong>Parameters</strong></div>
         <div class="card-body">
-            <span class="form-text">
+            <span class="form-text mb-12">
                 All parameter values can be entered as Jinja2 templates if desired.
                 The requesting object (device, Git repository, etc.), if any, will be provided
                 as context variable <code>obj</code>.

nautobot/extras/templatetags/custom_links.py

@@ -10,16 +10,16 @@ from nautobot.extras.models import CustomLink
 
 register = template.Library()
 
-LINK_BUTTON = '<a href="{}"{} class="btn btn-sm btn-{}">{}</a>\n'
+LINK_BUTTON = '<a href="{}"{} class="btn btn-{}">{}</a>\n'
 GROUP_BUTTON = (
-    '<div class="btn-group">\n'
-    '<button type="button" class="btn btn-sm btn-{} dropdown-toggle" data-toggle="dropdown">\n'
-    '{} <span class="caret"></span>\n'
+    '<div class="dropdown d-inline-flex align-middle">\n'
+    '<button type="button" class="btn btn-{} dropdown-toggle" data-bs-toggle="dropdown">\n'
+    '{} <span class="mdi mdi-chevron-down" aria-hidden="true"></span>\n'
     "</button>\n"
-    '<ul class="dropdown-menu pull-right">\n'
+    '<ul class="dropdown-menu float-end">\n'
     "{}</ul></div>\n"
 )
-GROUP_LINK = '<li><a href="{}"{}>{}</a></li>\n'
+GROUP_LINK = '<li><a class="dropdown-item" href="{}"{}>{}</a></li>\n'
 
 
 @register.simple_tag(takes_context=True)
@@ -58,12 +58,12 @@ def custom_links(context, obj):
                     link_rendered = render_jinja2(cl.target_url, link_context)
                     link_target = ' target="_blank"' if cl.new_window else ""
                     template_code += format_html(
-                        LINK_BUTTON, link_rendered, link_target, cl.button_class, text_rendered
+                        LINK_BUTTON, link_rendered, link_target, cl.button_class_css_class, text_rendered
                     )
             except Exception as e:
                 template_code += format_html(
-                    '<a class="btn btn-sm btn-default" disabled="disabled" title="{}">'
-                    '<i class="mdi mdi-alert"></i> {}</a>\n',
+                    '<a aria-disabled="true" class="btn btn-secondary disabled" title="{}">'
+                    '<span class="mdi mdi-alert"></span> {}</a>\n',
                     e,
                     cl.name,
                 )
@@ -81,13 +81,13 @@ def custom_links(context, obj):
                     links_rendered += format_html(GROUP_LINK, link_rendered, link_target, text_rendered)
             except Exception as e:
                 links_rendered += format_html(
-                    '<li><a disabled="disabled" title="{}"><span class="text-secondary">'
-                    '<i class="mdi mdi-alert"></i> {}</span></a></li>',
+                    '<li><a aria-disabled="true" class="disabled dropdown-item" title="{}"><span class="text-secondary">'
+                    '<span class="mdi mdi-alert"></span> {}</span></a></li>',
                     e,
                     cl.name,
                 )
 
         if links_rendered:
-            template_code += format_html(GROUP_BUTTON, links[0].button_class, group, links_rendered)
+            template_code += format_html(GROUP_BUTTON, links[0].button_class_css_class, group, links_rendered)
 
     return template_code

nautobot/extras/templatetags/job_buttons.py

@@ -13,11 +13,11 @@ from nautobot.extras.models import Job, JobButton, JobQueue
 register = template.Library()
 
 GROUP_DROPDOWN = """
-<div class="btn-group">
-  <button type="button" class="btn btn-sm btn-{group_button_class} dropdown-toggle" data-toggle="dropdown">
-    {group_name} <span class="caret"></span>
+<div class="dropdown d-inline-flex align-middle">
+  <button type="button" class="btn btn-{group_button_class} dropdown-toggle" data-bs-toggle="dropdown">
+    {group_name} <span class="mdi mdi-chevron-down" aria-hidden="true"></span>
   </button>
-  <ul class="dropdown-menu pull-right">
+  <ul class="dropdown-menu dropdown-menu-end">
     {grouped_buttons}
   </ul>
 </div>
@@ -33,7 +33,7 @@ HIDDEN_INPUTS = """
 """
 
 NO_CONFIRM_BUTTON = """
-<button type="submit" form="form_id_{button_id}" class="btn btn-sm btn-{button_class}" {disabled}>{button_text}</button>
+<button type="submit" form="form_id_{button_id}" class="btn btn-{button_class} {menu_item}" {disabled}>{button_text}</button>
 """
 
 NO_CONFIRM_FORM = """
@@ -43,7 +43,7 @@ NO_CONFIRM_FORM = """
 """
 
 CONFIRM_BUTTON = """
-<button type="button" class="btn btn-sm btn-{button_class}" data-toggle="modal" data-target="#confirm_modal_id_{button_id}" {disabled}>
+<button type="button" class="btn btn-{button_class} {menu_item}" data-bs-toggle="modal" data-bs-target="#confirm_modal_id_{button_id}" {disabled}>
   {button_text}
 </button>
 """
@@ -53,8 +53,8 @@ CONFIRM_MODAL = """
   <div class="modal-dialog" role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
         <h4 class="modal-title" id="confirm_modal_label_{button_id}">Confirmation</h4>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
       </div>
       <form id="form_id_{button_id}" action="{button_url}" method="post" class="form">
         <div class="modal-body">
@@ -62,7 +62,7 @@ CONFIRM_MODAL = """
           Run Job <strong>'{job}'</strong> with object <strong>'{object}'</strong>?
         </div>
         <div class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
           <button type="submit" class="btn btn-primary">Confirm</button>
         </div>
       </form>
@@ -94,8 +94,9 @@ def _render_job_button_for_obj(job_button, obj, context, content_type):
     except Exception as exc:
         return (
             format_html(
-                '<a class="btn btn-sm btn-{}" disabled="disabled" title="{}"><i class="mdi mdi-alert"></i> {}</a>\n',
-                "default" if not job_button.group_name else "link",
+                '<a aria-disabled="true" class="btn btn-{} disabled" title="{}">'
+                '<span class="mdi mdi-alert"></span> {}</a>\n',
+                "secondary" if not job_button.group_name else "link dropdown-item",
                 exc,
                 job_button.name,
             ),
@@ -123,12 +124,13 @@ def _render_job_button_for_obj(job_button, obj, context, content_type):
     template_args = {
         "button_id": job_button.pk,
         "button_text": text_rendered,
-        "button_class": job_button.button_class if not job_button.group_name else "link",
+        "button_class": job_button.button_class_css_class if not job_button.group_name else "link",
         "button_url": reverse("extras:job_run", kwargs={"pk": job_button.job.pk}),
         "object": obj,
         "job": job_button.job,
         "hidden_inputs": hidden_inputs,
         "disabled": "" if (has_run_perm and job_button.job.installed and job_button.job.enabled) else "disabled",
+        "menu_item": "dropdown-item" if job_button.group_name else "",
     }
 
     if job_button.confirmation:
@@ -170,7 +172,7 @@ def job_buttons(context, obj):
 
     # Add grouped buttons to template
     for group_name, buttons in group_names.items():
-        group_button_class = buttons[0].button_class
+        group_button_class = buttons[0].button_class_css_class
 
         buttons_rendered = SAFE_EMPTY_STR
 

nautobot/extras/test_jobs/invalid_import.py

@@ -0,0 +1,9 @@
+from nautobot.core.celery import register_jobs
+from nautobot.extras.jobs import Job, no_such_attribute  # noqa: F401  # pylint: disable=no-name-in-module
+
+
+class MyJob(Job):
+    pass
+
+
+register_jobs(MyJob)

nautobot/extras/test_jobs/log_counts_by_level.py

@@ -0,0 +1,23 @@
+from nautobot.core.celery import register_jobs
+from nautobot.extras.jobs import get_task_logger, Job
+
+logger = get_task_logger(__name__)
+
+
+class TestLogCountsByLevel(Job):
+    class Meta:
+        description = "Test counts of log entries by level."
+
+    def run(self):  # pylint: disable=arguments-differ
+        # intentionally omit debug
+        logger.info("This is an info log")
+        logger.info("This is an info log")
+        logger.warning("This is a warning log")
+        logger.warning("This is a warning log")
+        logger.error("This is an error log")
+        logger.critical("This is a critical log")
+        logger.failure("This is a failure log")
+        # success log will be added by post_run
+
+
+register_jobs(TestLogCountsByLevel)

nautobot/extras/test_jobs/missing_import.py

@@ -0,0 +1,11 @@
+from no_such_module import no_such_attribute  # noqa: F401  # pylint: disable=import-error
+
+from nautobot.core.celery import register_jobs
+from nautobot.extras.jobs import Job
+
+
+class MyJob(Job):
+    pass
+
+
+register_jobs(MyJob)

nautobot/extras/tests/integration/test_computedfields.py

@@ -1,15 +1,14 @@
 from django.contrib.contenttypes.models import ContentType
-from django.test import tag
 from django.urls import reverse
 
-from nautobot.core.testing.integration import SeleniumTestCase
+from nautobot.core.testing.integration import ObjectDetailsMixin, ObjectsListMixin, SeleniumTestCase
 from nautobot.dcim.models import Device
 from nautobot.extras.models import ComputedField
 
 from . import create_test_device
 
 
-class ComputedFieldsTestCase(SeleniumTestCase):
+class ComputedFieldsTestCase(SeleniumTestCase, ObjectDetailsMixin, ObjectsListMixin):
     """
     Integration test to check nautobot.extras.models.ComputedField.advanced_ui functionality
     and computed fields appearing in an object list
@@ -26,7 +25,6 @@ class ComputedFieldsTestCase(SeleniumTestCase):
             template="{{ obj.name }} is awesome!",
         )
 
-    @tag("fix_in_v3")
     def test_computed_field_advanced_ui(self):
         """
         This test creates a device and a computed field for that device.
@@ -41,7 +39,7 @@ class ComputedFieldsTestCase(SeleniumTestCase):
         self.assertTrue(self.browser.is_text_present("Device Computed Field"))
         self.assertTrue(self.browser.is_text_present(f"{self.device.name} is awesome!"))
         # # Check the computed field does NOT appear in the advanced tab
-        self.browser.links.find_by_partial_text("Advanced")[0].click()
+        self.switch_tab("Advanced")
         self.assertFalse(self.browser.is_text_present("Device Computed Field"))
         self.assertFalse(self.browser.is_text_present(f"{self.device.name} is awesome!"))
         # Set the custom_field to only show in the advanced tab
@@ -53,18 +51,20 @@ class ComputedFieldsTestCase(SeleniumTestCase):
         self.assertFalse(self.browser.is_text_present("Device Computed Field"))
         self.assertFalse(self.browser.is_text_present(f"{self.device.name} is awesome!"))
         # Check the computed field appears in the advanced tab
-        self.browser.links.find_by_partial_text("Advanced")[0].click()
+        self.switch_tab("Advanced")
         self.assertTrue(self.browser.is_text_present("Device Computed Field"))
         self.assertTrue(self.browser.is_text_present(f"{self.device.name} is awesome!"))
 
-    @tag("fix_in_v3")
     def test_computed_field_appears_in_object_list(self):
         """
         This test sets the computed field to be visible on the object list
         and then checks to see if it actually appears there.
         """
         self.browser.visit(f"{self.live_server_url}/dcim/devices/")
-        self.click_button("#table-configure-button")
+        self.click_button("""button[title="Configure table"]""")
+        nb_drawer_open_xpath = "//section[contains(@class, 'nb-drawer') and contains(@class, 'nb-drawer-open')]"
+        self.assertTrue(self.browser.is_element_present_by_xpath(nb_drawer_open_xpath, wait_time=5))
+        self.assertTrue(self.browser.find_by_xpath(nb_drawer_open_xpath).is_visible(wait_time=5))
         select_option = self.browser.find_by_xpath(
             ".//select[@id='id_columns']/option[contains(text(), 'Device Computed Field')]"
         )
@@ -72,6 +72,5 @@ class ComputedFieldsTestCase(SeleniumTestCase):
         select_option.click()
         self.browser.find_by_xpath(".//input[@value='Save']").click()
         self.assertTrue(self.browser.is_text_present(f"{self.device.name} is awesome!"))
-        self.browser.find_by_xpath(".//button[@data-original-title='Configure table']").click()
         self.browser.find_by_xpath(".//input[@value='Reset']").click()
         self.assertFalse(self.browser.is_text_present(f"{self.device.name} is awesome!"))