PyPI - nautobot - Versions diffs - 2.1.7__py3-none-any.whl → 2.1.9__py3-none-any.whl - Mend

nautobot 2.1.7py3-none-any.whl → 2.1.9py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of nautobot might be problematic. Click here for more details.

Files changed (338) hide show

nautobot/core/templates/generic/object_list.html CHANGED Viewed

@@ -1,6 +1,7 @@
 {% extends 'base.html' %}
 {% load buttons %}
 {% load helpers %}
+{% load plugins %}
 {% load static %}
 {% block header %}
@@ -36,6 +37,7 @@
 {% block content %}
 <div class="pull-right noprint">
     {% block buttons %}{% endblock %}
+    {% plugin_buttons content_type.model_class 'list' %}
     {% if table and request.user.is_authenticated and table_config_form %}
         <button type="button" class="btn btn-default" data-toggle="modal" data-target="#ObjectTable_config" title="Configure table"><i class="mdi mdi-cog"></i> Configure</button>
     {% endif %}

nautobot/core/templates/graphene/graphiql.html CHANGED Viewed

@@ -10,53 +10,31 @@ add "&raw" to the end of the URL within a browser.
 <!DOCTYPE html>
 <html>
 <head>
+  {% include 'inc/media.html' %}
+  {% block extra_styles %}{% endblock %}
   <!-- Nautobot template requirements -->
   <title>{% block title %}GraphiQL{% endblock %} - {{ settings.BRANDING_TITLE }}</title>
-  <link rel="stylesheet"
-        href="{% static 'bootstrap-3.4.1-dist/css/bootstrap.min.css' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=bootstrap-3.4.1-dist/css/bootstrap.min.css'">
-  <link rel="stylesheet"
-        href="{% static 'materialdesignicons-6.5.95/css/materialdesignicons.min.css' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=materialdesignicons-6.5.95/css/materialdesignicons.min.css'">
-  <link rel="stylesheet"
-        href="{% static 'jquery-ui-1.13.1/jquery-ui.min.css' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=jquery-ui-1.13.1/jquery-ui.min.css'">
-  <link rel="stylesheet"
-        href="{% static 'select2-4.0.13/select2.min.css' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=select2-4.0.13/select2.min.css'">
-  <link rel="stylesheet"
-        href="{% static 'select2-bootstrap-0.1.0-beta.10/select2-bootstrap.min.css' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=select2-bootstrap-0.1.0-beta.10/select2-bootstrap.min.css'">
-  <link rel="stylesheet"
-        href="{% static 'flatpickr-4.6.9/themes/light.min.css' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=flatpickr-4.6.9/themes/light.min.css'">
-  <link rel="stylesheet" id="dark-theme"
-        href="{% versioned_static 'css/dark.css' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=css/dark.css'" disabled="disabled" />
-  <link rel="stylesheet"
-        href="{% versioned_static 'css/base.css' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=css/base.css'">
-  <link rel="apple-touch-icon" sizes="180x180" href="{% custom_branding_or_static 'icon_180' 'img/nautobot_icon_180x180.png' %}">
-  <link rel="icon" type="image/png" sizes="32x32" href="{% custom_branding_or_static 'icon_32' 'img/nautobot_icon_32x32.png' %}">
-  <link rel="icon" type="image/png" sizes="16x16" href="{% custom_branding_or_static 'icon_16' 'img/nautobot_icon_16x16.png' %}">
-  <link rel="icon" type="image/png" sizes="192x192" href="{% custom_branding_or_static 'icon_192' 'img/nautobot_icon_192x192.png' %}">
-  <link rel="mask-icon" type="image/png" color="#0097ff" href="{% custom_branding_or_static 'icon_mask' 'img/nautobot_icon_monochrome.png' %}">
-  <link rel="shortcut icon" href="{% custom_branding_or_static 'favicon' 'img/favicon.ico' %}">
-  <meta name="msapplication-TileColor" content="#2d89ef">
-  <meta name="theme-color" content="#ffffff">
-  <meta charset="UTF-8">
-  <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
   <!-- GraphiQL template requirements -->
   <style>
-    html, body, #editor {
-      height: 100%;
+    #editor {
       margin: 0;
       width: 100%;
+      height: calc(100vh - 56px - 3rem);
     }
     .toolbar .dropdown-menu > li > a {
         clear: left;
         margin-right: 120px;  /* leave room for the "Save Changes" button if present */
     }
+    .graphiql-container .doc-explorer-title-bar {
+      box-sizing: content-box;
+  }
+    .graphiql-container .history-title-bar {
+      box-sizing: content-box;
+  }
+  .graphiql-container .docExplorerShow {
+    white-space: nowrap;
+  }
   </style>
   <!-- As Nautobot may be run without internet access, we source these files locally rather than from an online CDN -->
   <link rel="stylesheet"
@@ -72,23 +50,16 @@ add "&raw" to the end of the URL within a browser.
           onerror="window.location='{% url 'media_failure' %}?filename=graphiql-1.5.16/graphiql.min.js'"></script>
   <script src="{% static 'subscriptions-transport-ws-0.9.18/client.min.js' %}"
       onerror="window.location='{% url 'media_failure' %}?filename=subscriptions-transport-ws-0.9.18/client.min.js'"></script>
-  <!-- Custom CSS to address some conflicts between the two -->
-  <style>
-    body {
-      padding-top: 54px;
-    }
-    .graphiql-container .doc-explorer-title-bar {
-        box-sizing: content-box;
-    }
-  </style>
 </head>
 <body>
   <!-- Nautobot page contents -->
   {% include 'inc/nav_menu.html' %}
   {% include 'modals/modal_theme.html' with name='theme'%}
   {% include 'inc/javascript.html' %}
-  <!-- GraphiQL page contents -->
-  <div id="editor"></div>
+  <div class="container-fluid wrapper" id="main-content">
+    <!-- GraphiQL page contents -->
+    <div id="editor"></div>
+  </div>
   {% include 'inc/footer.html' %}
   {% csrf_token %}
   <script type="application/javascript">

nautobot/core/templates/inc/footer.html CHANGED Viewed

@@ -3,8 +3,8 @@
 {% load plugins %}
 <style>
-    /* Styles for viewports narrower than 1007px */
-    @media (max-width: 1007px) {
+    /* Styles for viewports narrower than 1232px, i.e. bootstrap 'xs' and 'sm' layouts */
+    @media (max-width: 1232px) {
         .footer-col-1, .footer-col-2, .footer-col-3 {
             text-align: center !important;
         }
@@ -19,7 +19,7 @@
     <footer class="footer" id="footer">
         <div class="container-fluid">
             <div class="row">
-                <div class="col-xl-4 col-lg-4 col-md-4 col-sm-3 col-xs-12 text-left footer-col-1 no-wrap">
+                <div class="col-xl-4 col-lg-4 col-md-3 col-sm-12 col-xs-12 text-left footer-col-1 no-wrap">
                     {% if request.user.is_authenticated  %}
                         <p class="text-muted">
                             {% if settings.BRANDING_FILEPATHS.logo and settings.BRANDING_POWERED_BY_URL %}<a href="{{ settings.BRANDING_POWERED_BY_URL }}"><img src="{% static 'img/nautobot_logo.svg' %}" height="20" /> Powered</a> &middot;{% endif %}
@@ -27,10 +27,10 @@
                         </p>
                     {% endif %}
                 </div>
-                <div class="col-xl-4 col-lg-4 col-md-4 col-sm-3 col-xs-12 text-center footer-col-2">
+                <div class="col-xl-4 col-lg-3 col-md-3 col-sm-12 col-xs-12 text-center footer-col-2">
                     <p class="text-muted">{% now 'Y-m-d H:i:s T' %}</p>
                 </div>
-                <div class="col-xl-4 col-lg-4 col-md-4 col-sm-6 col-xs-12 text-right footer-col-3 noprint">
+                <div class="col-xl-4 col-lg-5 col-md-6 col-sm-12 col-xs-12 text-right footer-col-3 noprint">
                     {% if request.user.is_authenticated  %}
                     <p class="text-muted footer-links">
                         <a href="#theme_modal" data-toggle="modal" data-target="#theme_modal" id="btn-theme-modal"><i class="mdi mdi-theme-light-dark text-primary"></i>Theme</a> &middot;

nautobot/core/templates/inc/nav_menu.html CHANGED Viewed

@@ -121,9 +121,6 @@
     document.addEventListener('DOMContentLoaded', function() {
         const navbar = document.querySelector('.navbar-fixed-left');
         const navbarHeader = document.querySelector('.navbar-header');
-        const breadcrumb = document.querySelector('.breadcrumb');
-        const bannerAlertArea = document.querySelector('.banner-alert-area');
-        const bannerAlert = document.querySelector('.plugin-banner') !== null;
         const mainContent = document.querySelector('#main-content');
         const footer = document.querySelector('#footer');
         const dropdownToggles = document.querySelectorAll('.navbar-fixed-left .navbar-nav > .dropdown > a[data-toggle="collapse"]');
@@ -180,10 +177,6 @@
         function adjustElementsForNavbarState(isCollapsed) {
             const marginLeftValue = isCollapsed ? '-240px' : '0px';
             mainContent.style.marginLeft = marginLeftValue;
-            bannerAlertArea.classList.toggle('collapsed', isCollapsed);
-            if(!bannerAlert && breadcrumb) {
-                breadcrumb.classList.toggle('collapsed', isCollapsed);
-            };
             if(footer) footer.style.marginLeft = marginLeftValue;
             toggler.style.left = isCollapsed ? '-5px' : '225px';
         }

nautobot/core/templates/nautobot_config.py.j2 CHANGED Viewed

@@ -37,6 +37,12 @@ from nautobot.core.settings_funcs import is_truthy, parse_redis_connection
 # Number of seconds to cache ContentType lookups. Set to 0 to disable caching.
 # CONTENT_TYPE_CACHE_TIMEOUT = int(os.getenv("NAUTOBOT_CONTENT_TYPE_CACHE_TIMEOUT", "0"))
+# Celery Beat heartbeat file path - will be touched by Beat each time it wakes up as a proof-of-health.
+# CELERY_BEAT_HEARTBEAT_FILE = os.getenv(
+#     "NAUTOBOT_CELERY_BEAT_HEARTBEAT_FILE",
+#     os.path.join(tempfile.gettempdir(), "nautobot_celery_beat_heartbeat"),
+# )
 # Celery broker URL used to tell workers where queues are located
 #
 # CELERY_BROKER_URL = os.getenv("NAUTOBOT_CELERY_BROKER_URL", parse_redis_connection(redis_database=0))

nautobot/core/templates/rest_framework/api.html CHANGED Viewed

@@ -7,13 +7,20 @@
     {% include 'inc/media.html' %}
 {% endblock bootstrap_theme %}
-{% block navbar %}
-    {% include 'inc/nav_menu.html' %}
-{% endblock navbar %}
 {% block body %}
-    {{ block.super }}
+    {% include 'inc/nav_menu.html' %}
+    <div class="container-fluid" id="main-content">
+        {{ block.super }}
+    </div>
     {% include 'inc/footer.html' %}
+    <style>
+        .navbar-static-top {
+            display: none;
+        }
+        #main-content {
+            min-height: calc(100vh - 70px);
+        }
+    </style>
 {% endblock body %}
 {% block script %}

nautobot/core/testing/mixins.py CHANGED Viewed

@@ -4,6 +4,7 @@ import warnings
 from django.apps import apps
 from django.contrib.auth import get_user_model
 from django.contrib.contenttypes.models import ContentType
+from django.core.cache import cache
 from django.core.exceptions import FieldDoesNotExist
 from django.db.models import JSONField, ManyToManyField
 from django.forms.models import model_to_dict
@@ -13,7 +14,7 @@ from rest_framework.test import APIClient, APIRequestFactory
 from nautobot.core import testing
 from nautobot.core.models import fields as core_fields
 from nautobot.core.utils import permissions
-from nautobot.extras import management, models as extras_models, signals as extras_signals
+from nautobot.extras import management, models as extras_models
 from nautobot.users import models as users_models
 # Use the proper swappable User model
@@ -63,11 +64,18 @@ class NautobotTestCaseMixin:
             self.client.force_login(self.user)
     def tearDown(self):
-        """Clear lru_cache data to avoid leakage of information between test cases when running in parallel."""
-        extras_signals.invalidate_lru_cache(extras_models.CustomField)
-        extras_signals.invalidate_lru_cache(extras_models.ComputedField)
-        extras_signals.invalidate_lru_cache(extras_models.Relationship)
+        """
+        Clear cache after each test case.
+        In theory this shouldn't be necessary as our cache **should** appropriately update and clear itself when
+        data changes occur, but in practice we've seen issues here. Best guess at present is that it's due to
+        `TransactionTestCase` truncating the database, which presumably doesn't trigger the relevant Django signals
+        that would otherwise refresh the cache appropriately.
+        See also: https://code.djangoproject.com/ticket/11505
+        """
         super().tearDown()
+        cache.clear()
     def prepare_instance(self, instance):
         """

nautobot/core/tests/integration/test_plugin_navbar.py CHANGED Viewed

@@ -15,47 +15,33 @@ class PluginNavBarTestCase(SeleniumTestCase):
     fixtures = ["user-data.json"]
     navbar = {
-        "Example Menu": {
-            "Example Group 1": {
-                "Example Model": {
-                    "permission": "example_plugin.view_examplemodel",
-                    "buttons": ["Add"],
-                },
-            },
-        },
         "Circuits": {
             "Circuits": {
                 "Circuits": {
-                    "permission": "circuits.view_circuit",
                     "buttons": ["Add"],
                 },
                 "Circuit Types": {
-                    "permission": "circuits.view_circuittype",
                     "buttons": ["Add"],
                 },
             },
             "Example Circuit Group": {
-                "Example Model": {
-                    "permission": "example_plugin.view_examplemodel",
+                "Example Models": {
                     "buttons": ["Add"],
                 },
             },
             "Providers": {
                 "Providers": {
-                    "permission": "circuits.view_provider",
                     "buttons": ["Add"],
                 },
             },
         },
         "Plugins": {
             "Example Nautobot App": {
-                "Models": {
-                    "permission": "example_plugin.view_examplemodel",
-                    "buttons": ["Add a new example model"],
+                "Example Models": {
+                    "buttons": ["Add"],
                 },
-                "Other Models": {
-                    "permission": "example_plugin.view_examplemodel",
-                    "buttons": [],
+                "Another Example Models": {
+                    "buttons": ["Add"],
                 },
             },
         },
@@ -87,7 +73,7 @@ class PluginNavBarTestCase(SeleniumTestCase):
         group = tab.find_by_xpath(f"{tab_xpath}/following-sibling::ul//li[normalize-space()='Example Group 1']")
-        item_xpath = f"{tab_xpath}/following-sibling::ul//li[.//a[normalize-space()='Example Model']]"
+        item_xpath = f"{tab_xpath}/following-sibling::ul//li[.//a[normalize-space()='Example Models']]"
         group.find_by_xpath(item_xpath)
     def test_plugin_navbar_modify_circuits(self):
@@ -147,7 +133,7 @@ class PluginNavBarTestCase(SeleniumTestCase):
                 for button_name in item_details["buttons"]:
                     button = item.find_by_xpath(f"{item_xpath}/div//a[@data-original-title='{button_name}']")
                     if button_class := getattr(ButtonActionColorChoices, button_name.upper(), None):
-                        self.assertIn(button_class, button.get_attribute("class"))
+                        self.assertIn(button_class, button["class"])
                     if button_icon := getattr(ButtonActionIconChoices, button_name.upper(), None):
                         icon = button.find_by_xpath(f"{item_xpath}/div//a[@data-original-title='{button_name}']/i")
                         self.assertIn(button_icon, icon["class"])

nautobot/core/tests/integration/test_view_authentication.py ADDED Viewed

@@ -0,0 +1,67 @@
+from django.test import tag
+from nautobot.core.testing import TestCase
+from nautobot.core.utils.lookup import get_url_for_url_pattern, get_url_patterns
+@tag("integration")
+class AuthenticationEnforcedTestCase(TestCase):
+    r"""
+    Test that all\* registered views require authentication to access.
+    \* with a very small number of known exceptions such as login and logout views.
+    """
+    def test_all_views_require_authentication(self):
+        self.client.logout()
+        url_patterns = get_url_patterns()
+        for url_pattern in url_patterns:
+            with self.subTest(url_pattern=url_pattern):
+                url = get_url_for_url_pattern(url_pattern)
+                response = self.client.get(url, follow=True)
+                if response.status_code == 405:  # Method not allowed
+                    response = self.client.post(url, follow=True)
+                # Is a view that *should* be open to unauthenticated users?
+                if url in [
+                    "/admin/login/",
+                    "/api/plugins/example-plugin/webhook/",
+                    "/health/",
+                    "/login/",
+                    "/media-failure/",
+                    "/template.css",
+                ]:
+                    self.assertHttpStatus(response, 200, msg=url)
+                elif response.status_code == 200:
+                    # UI views generally should redirect unauthenticated users to the appropriate login page
+                    if url.startswith("/admin"):
+                        if "logout" in url:
+                            # /admin/logout/ sets next=/admin/ because having login redirect to logout would be silly
+                            redirect_url = "/admin/login/?next=/admin/"
+                        else:
+                            redirect_url = f"/admin/login/?next={url}"
+                    else:
+                        if "logout" in url:
+                            # /logout/ sets next=/ because having login redirect back to logout would be silly
+                            redirect_url = "/login/?next=/"
+                        else:
+                            redirect_url = f"/login/?next={url}"
+                    self.assertRedirects(response, redirect_url)
+                elif response.status_code != 403:
+                    if any(
+                        url.startswith(path)
+                        for path in [
+                            "/complete/",  # social auth
+                            "/login/",  # social auth
+                            "/media/",  # MEDIA_ROOT
+                            "/plugins/example-plugin/docs/",  # STATIC_ROOT
+                        ]
+                    ):
+                        self.assertEqual(response.status_code, 404)
+                    else:
+                        self.fail(
+                            f"Unexpected {response.status_code} response at {url}: "
+                            + response.content.decode(response.charset)
+                        )

nautobot/core/tests/runner.py CHANGED Viewed

@@ -1,11 +1,32 @@
+import copy
 from django.conf import settings
 from django.core.management import call_command
 from django.db import connections
-from django.test.runner import DiscoverRunner
-from django.test.utils import get_unique_databases_and_mirrors, NullTimeKeeper
+from django.test.runner import _init_worker, DiscoverRunner, ParallelTestSuite
+from django.test.utils import get_unique_databases_and_mirrors, NullTimeKeeper, override_settings
 import yaml
 from nautobot.core.celery import app, setup_nautobot_job_logging
+from nautobot.core.settings_funcs import parse_redis_connection
+def init_worker_with_unique_cache(counter):
+    """Extend Django's default parallel unit test setup to also ensure distinct Redis caches."""
+    _init_worker(counter)  # call Django default to set _worker_id and set up parallel DB instances
+    # _worker_id is now 1, 2, 3, 4, etc.
+    from django.test.runner import _worker_id
+    # Redis DB indices 0 and 1 are used by non-automated testing, so we want to start at index 2
+    caches = copy.deepcopy(settings.CACHES)
+    caches["default"]["LOCATION"] = parse_redis_connection(redis_database=_worker_id + 1)
+    override_settings(CACHES=caches).enable()
+    print(f"Set settings.CACHES['default']['LOCATION'] to use Redis index {_worker_id + 1}")
+class NautobotParallelTestSuite(ParallelTestSuite):
+    init_worker = init_worker_with_unique_cache
 class NautobotTestRunner(DiscoverRunner):
@@ -22,6 +43,8 @@ class NautobotTestRunner(DiscoverRunner):
     Only integration tests that DO NOT inherit from `SeleniumTestCase` will need to be explicitly tagged.
     """
+    parallel_test_suite = NautobotParallelTestSuite
     exclude_tags = ["integration"]
     def __init__(self, cache_test_fixtures=False, **kwargs):

nautobot/core/tests/test_graphql.py CHANGED Viewed

@@ -630,21 +630,9 @@ class GraphQLAPIPermissionTest(GraphQLTestCaseBase):
         self.assertEqual(names, ["Rack 1-1", "Rack 1-2", "Rack 2-1", "Rack 2-2"])
     def test_graphql_api_no_token(self):
-        """Validate unauthenticated users are not able to query anything by default."""
+        """Validate unauthenticated users are not able to query anything."""
         response = self.client.post(self.api_url, {"query": self.get_racks_query}, format="json")
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertIsInstance(response.data["data"]["racks"], list)
-        names = [item["name"] for item in response.data["data"]["racks"]]
-        self.assertEqual(names, [])
-    @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
-    def test_graphql_api_no_token_exempt(self):
-        """Validate unauthenticated users are able to query based on the exempt permissions."""
-        response = self.client.post(self.api_url, {"query": self.get_racks_query}, format="json")
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertIsInstance(response.data["data"]["racks"], list)
-        names = [item["name"] for item in response.data["data"]["racks"]]
-        self.assertEqual(names, ["Rack 1-1", "Rack 1-2", "Rack 2-1", "Rack 2-2"])
+        self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
     def test_graphql_api_wrong_token(self):
         """Validate a wrong token return 403."""

nautobot/core/tests/test_models.py CHANGED Viewed

@@ -113,7 +113,7 @@ class NaturalKeyTestCase(BaseModelTest):
         """
         # Ensure the cache is empty from previous tests
-        cache.delete(f"{self.FakeBaseModel._meta.label_lower}._content_type")
+        cache.delete(self.FakeBaseModel._content_type_cache_key)
         with patch.object(self.FakeBaseModel, "_content_type", return_value=True) as mock__content_type:
             self.FakeBaseModel._content_type_cached
@@ -127,7 +127,7 @@ class NaturalKeyTestCase(BaseModelTest):
             self.assertEqual(mock__content_type.call_count, 2)
         # Clean-up after ourselves
-        cache.delete(f"{self.FakeBaseModel._meta.label_lower}._content_type")
+        cache.delete(self.FakeBaseModel._content_type_cache_key)
     @override_settings(CONTENT_TYPE_CACHE_TIMEOUT=0)
     def test__content_type_caching_disabled(self):
@@ -136,7 +136,7 @@ class NaturalKeyTestCase(BaseModelTest):
         """
         # Ensure the cache is empty from previous tests
-        cache.delete(f"{self.FakeBaseModel._meta.label_lower}._content_type")
+        cache.delete(self.FakeBaseModel._content_type_cache_key)
         with patch.object(self.FakeBaseModel, "_content_type", return_value=True) as mock__content_type:
             self.FakeBaseModel._content_type_cached

nautobot/core/tests/test_navigations.py CHANGED Viewed

@@ -1,13 +1,72 @@
 from unittest.mock import patch
-from django.test import TestCase
+from django.test import tag, TestCase
+from django.urls import resolve
 from nautobot.core.apps import NAV_CONTEXT_NAMES, NavContext, NavGrouping, NavItem, register_new_ui_menu_items
+from nautobot.core.choices import ButtonActionColorChoices, ButtonActionIconChoices
+from nautobot.core.templatetags.helpers import bettertitle
+from nautobot.core.utils.lookup import get_route_for_model
+from nautobot.core.utils.permissions import get_permission_for_model
+from nautobot.extras.registry import registry
-# TODO(timizuo): Here might not be the best place to add this test class
+@tag("unit")
+class NavMenuTestCase(TestCase):
+    """Verify correct construction of the nav menu."""
+    def test_menu_item_attributes(self):
+        """Verify that menu items and buttons have the correct text and expected permissions."""
+        for tab in registry["nav_menu"]["tabs"]:
+            for group in registry["nav_menu"]["tabs"][tab]["groups"]:
+                for item_url, item_details in registry["nav_menu"]["tabs"][tab]["groups"][group]["items"].items():
+                    with self.subTest(f"{tab} > {group} > {item_url}"):
+                        view_func = resolve(item_url).func
+                        try:
+                            # NautobotUIViewSet
+                            view_class = view_func.view_class
+                        except AttributeError:
+                            # ObjectListView
+                            view_class = view_func.cls
+                        try:
+                            view_queryset = view_class.queryset
+                            view_model = view_queryset.model
+                            if item_details["name"] not in {
+                                "Elevations",
+                                "Interface Connections",
+                                "Console Connections",
+                                "Power Connections",
+                                "Job Approval Queue",
+                            }:
+                                expected_name = bettertitle(view_model._meta.verbose_name_plural)
+                                if expected_name == "VM Interfaces":
+                                    expected_name = "Interfaces"
+                                elif expected_name == "Object Changes":
+                                    expected_name = "Change Log"
+                                self.assertEqual(item_details["name"], expected_name)
+                            if item_url == get_route_for_model(view_model, "list"):
+                                # Not assertEqual as some menu items have additional permissions defined.
+                                self.assertIn(get_permission_for_model(view_model, "view"), item_details["permissions"])
+                        except AttributeError:
+                            # Not a model view?
+                            self.assertIn(item_details["name"], {"Installed Plugins", "Interface Connections"})
+                    for button, button_details in item_details["buttons"].items():
+                        with self.subTest(f"{tab} > {group} > {item_url} > {button}"):
+                            # Currently all core menu items should have just a single Add button
+                            self.assertEqual(button, "Add")
+                            self.assertEqual(
+                                button_details["permissions"], {get_permission_for_model(view_model, "add")}
+                            )
+                            self.assertEqual(button_details["link"], get_route_for_model(view_model, "add"))
+                            self.assertEqual(button_details["button_class"], ButtonActionColorChoices.ADD)
+                            self.assertEqual(button_details["icon_class"], ButtonActionIconChoices.ADD)
+@tag("unit")
 class NewUINavTest(TestCase):
-    @patch("nautobot.core.apps.registry", {"new_ui_nav_menu": {}})
+    @patch.dict(registry, values={"new_ui_nav_menu": {}}, clear=True)
     def test_build_new_ui_nav_menu(self):
         """Assert building and adding of new ui nav to registry
@@ -15,8 +74,6 @@ class NewUINavTest(TestCase):
         1. New UI nav is added to registry["new_ui_nav_menu"]
         2. registry["new_ui_nav_menu"] is sorted by weight
         """
-        from nautobot.core.apps import registry  # Import here cause of the mock patch
         # Test App 1
         navigation_1 = (
             NavContext(
@@ -32,7 +89,7 @@ class NewUINavTest(TestCase):
                     NavGrouping(
                         name="App 1 Inventory Group 2",
                         items=(
-                            NavItem(name="Menu 1", link="extras:role_list", permissions=["extras.view_status"]),
+                            NavItem(name="Menu 1", link="extras:role_list", permissions=["extras.view_role"]),
                             NavItem(name="Menu 2", link="extras:tag_list"),
                         ),
                     ),
@@ -62,7 +119,7 @@ class NewUINavTest(TestCase):
                         items=(
                             NavItem(name="Tags", link="extras:tag_list"),
                             NavItem(name="Location", link="dcim:location_list"),
-                            NavItem(name="Roles", link="extras:role_list", permissions=["extras.view_status"]),
+                            NavItem(name="Roles", link="extras:role_list", permissions=["extras.view_role"]),
                         ),
                     ),
                 ),
@@ -100,7 +157,7 @@ class NewUINavTest(TestCase):
                                 "Menu 1": {
                                     "name": "Menu 1",
                                     "weight": 1000,
-                                    "permissions": ["extras.view_status"],
+                                    "permissions": ["extras.view_role"],
                                     "data": "/extras/roles/",
                                 },
                                 "Menu 2": {
@@ -157,7 +214,7 @@ class NewUINavTest(TestCase):
                                 "Roles": {
                                     "name": "Roles",
                                     "weight": 1000,
-                                    "permissions": ["extras.view_status"],
+                                    "permissions": ["extras.view_role"],
                                     "data": "/extras/roles/",
                                 },
                             },
@@ -171,7 +228,7 @@ class NewUINavTest(TestCase):
     def test_validation_in_new_ui_navigation_classes(self):
         """Test Validation on each of the new ui navigation classes `NavItem`, `NavGrouping`, `NavContext`"""
-        nav_item_1 = NavItem(name="Menu 1", link="extras:role_list", permissions=["extras.view_status"])
+        nav_item_1 = NavItem(name="Menu 1", link="extras:role_list", permissions=["extras.view_role"])
         nav_item_2 = NavItem(name="Menu 2", link="invalid_url")
         self.assertEqual(
             nav_item_1.initial_dict,

nautobot/core/tests/test_releases.py CHANGED Viewed

@@ -105,7 +105,9 @@ class GetReleasesTestCase(SimpleTestCase):
         # Check if result is put in cache
         expected_version_str, expected_url = max(releases)
         expected_version = version.parse(expected_version_str)
-        mock_cache_set.assert_called_once_with("latest_release", (expected_version, expected_url), 160876)
+        mock_cache_set.assert_called_once_with(
+            "nautobot.core.releases.get_latest_release", (expected_version, expected_url), 160876
+        )
     @patch.object(requests, "get")
     @patch.object(cache, "set")
@@ -142,7 +144,9 @@ class GetReleasesTestCase(SimpleTestCase):
         # Check if result is put in cache
         expected_version_str, expected_url = max(releases)
         expected_version = version.parse(expected_version_str)
-        mock_cache_set.assert_called_once_with("latest_release", (expected_version, expected_url), 160876)
+        mock_cache_set.assert_called_once_with(
+            "nautobot.core.releases.get_latest_release", (expected_version, expected_url), 160876
+        )
     @patch.object(requests, "get")
     @patch.object(cache, "set")
@@ -172,7 +176,9 @@ class GetReleasesTestCase(SimpleTestCase):
         )
         # Check if failure is put in cache
-        mock_cache_set.assert_called_once_with("latest_release_no_retry", "https://localhost/unittest/releases", 900)
+        mock_cache_set.assert_called_once_with(
+            "nautobot.core.releases.get_releases.no_retry", "https://localhost/unittest/releases", 900
+        )
     @patch.object(requests, "get")
     @patch.object(cache, "set")

nautobot 2.1.7__py3-none-any.whl → 2.1.9__py3-none-any.whl

Potentially problematic release.

nautobot 2.1.7py3-none-any.whl → 2.1.9py3-none-any.whl