nautobot 2.3.1__py3-none-any.whl → 2.3.3__py3-none-any.whl

nautobot/core/celery/schedulers.py

@@ -1,4 +1,5 @@
 from collections.abc import Mapping
+from datetime import datetime
 import logging
 from pathlib import Path
 
@@ -20,7 +21,10 @@ class NautobotScheduleEntry(ModelEntry):
 
     def __init__(self, model, app=None):
         """Initialize the model entry."""
+        # copy-paste from django_celery_beat.schedulers
         self.app = app or current_app._get_current_object()
+
+        # Nautobot-specific logic
         self.name = f"{model.name}_{model.pk}"
         self.task = "nautobot.extras.jobs.run_job"
         try:
@@ -33,6 +37,8 @@ class NautobotScheduleEntry(ModelEntry):
         except (TypeError, ValueError) as exc:
             logger.exception("Removing schedule %s for argument deserialization error: %s", self.name, exc)
             self._disable(model)
+
+        # copy-paste from django_celery_beat.schedulers
         try:
             self.schedule = model.schedule
         except model.DoesNotExist:
@@ -42,6 +48,7 @@ class NautobotScheduleEntry(ModelEntry):
             )
             self._disable(model)
 
+        # Nautobot-specific logic
         self.options = {"nautobot_job_scheduled_job_id": model.id, "headers": {}}
 
         if model.user:
@@ -65,14 +72,25 @@ class NautobotScheduleEntry(ModelEntry):
         if isinstance(model.celery_kwargs, Mapping):
             self.options.update(model.celery_kwargs)
 
+        # copy-paste from django_celery_beat.schedulers
         self.total_run_count = model.total_run_count
         self.model = model
 
         if not model.last_run_at:
             model.last_run_at = self._default_now()
+            # if last_run_at is not set and
+            # model.start_time last_run_at should be in way past.
+            # This will trigger the job to run at start_time
+            # and avoid the heap block.
+            if model.start_time:
+                model.last_run_at = model.last_run_at - datetime.timedelta(days=365 * 30)
 
         self.last_run_at = model.last_run_at
 
+    def _default_now(self):
+        """Instead of using self.app.timezone, use the timezone specific to this schedule entry."""
+        return datetime.now(self.model.time_zone)
+
 
 class NautobotDatabaseScheduler(DatabaseScheduler):
     """

nautobot/core/settings.yaml

@@ -1830,9 +1830,9 @@ properties:
       The time zone Nautobot will use when dealing with dates and times. It is recommended to use UTC time unless you have a specific need to use a local time zone. Please see the [list of available time zones](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones).
     details: |-
       !!! warning
-          Scheduled jobs will run in the time zone configured in this setting. If you change this setting from the
-          default UTC, you must change it on the Celery Beat server and all Nautobot web servers or your scheduled
-          jobs may run in the wrong time zone.
+          Scheduled jobs will default to running in the time zone configured in this setting.
+          If you change this setting from the default UTC, it must be set consistently on the Celery Beat server
+          and all Nautobot web servers, or else your scheduled jobs may run in the wrong time zone.
     environment_variable: "NAUTOBOT_TIME_ZONE"
     see_also:
       "Time Zones documentation": "./time-zones.md"

nautobot/core/tables.py

@@ -49,7 +49,7 @@ class BaseTable(django_tables2.Table):
         # Add custom field columns
         model = self._meta.model
 
-        if model.is_dynamic_group_associable_model:
+        if getattr(model, "is_dynamic_group_associable_model", False):
             self.base_columns["dynamic_group_count"] = LinkedCountColumn(
                 viewname="extras:dynamicgroup_list",
                 url_params={"member_id": "pk"},

nautobot/core/templates/home.html

@@ -39,10 +39,11 @@
                 {% for panel_name, panel_details in registry.homepage_layout.panels.items %}
                     {% if request.user|has_one_or_more_perms:panel_details.permissions %}
                         <div class="panel panel-default" id="{{ panel_name|slugify }}" style="break-inside: avoid" data-panel-weight="{{ panel_details.weight }}">
-                            <div class="panel-heading">
-                                <strong>{{ panel_name }}</strong><span id="toggle-homepanel-{{ panel_name|slugify }}" class="glyphicon glyphicon-chevron-down collapse-icon" type="button" data-toggle="collapse" data-target="#homepanel-{{ panel_name|slugify }}" aria-expanded="false" aria-controls="homepanel-{{ panel_name|slugify }}"></span>
-                            </div>
                             {% with cookie_key='homepanel-'|add:panel_name|slugify %}
+                                <div class="panel-heading">
+                                    <strong>{{ panel_name }}</strong>
+                                    <span id="collapse-icon-{{ panel_name|slugify }}" class="glyphicon glyphicon-chevron-down collapse-icon{% if request.COOKIES|default:''|get_item:cookie_key|default:'False' == 'False' %} rotated180{% endif %}" type="button" data-toggle="collapse" data-target="#homepanel-{{ panel_name|slugify }}" aria-expanded="false" aria-controls="homepanel-{{ panel_name|slugify }}"></span>
+                                </div>
                                 <div class="list-group collapse{% if request.COOKIES|default:''|get_item:cookie_key|default:'False' == 'False' %} in{% endif %} collapsible-div" id="homepanel-{{ panel_name|slugify }}" >
                             {% endwith %}
                                 {% if panel_details.rendered_html %}

nautobot/core/templatetags/buttons.py

@@ -165,7 +165,7 @@ def consolidate_bulk_action_buttons(context):
 
     render_edit_button = bool(context["bulk_edit_url"] and context["permissions"]["change"])
     render_static_group_assign_button = bool(
-        context["model"].is_dynamic_group_associable_model
+        getattr(context["model"], "is_dynamic_group_associable_model", False)
         and context["user"].has_perms(["extras.add_staticgroupassociation"])
     )
     render_delete_button = bool(context["bulk_delete_url"] and context["permissions"]["delete"])

nautobot/core/tests/runner.py

@@ -1,6 +1,13 @@
 import copy
 import hashlib
 
+try:
+    from coverage import Coverage
+
+    has_coverage = True
+except ImportError:
+    has_coverage = False
+
 from django.conf import settings
 from django.core.management import call_command
 from django.db import connections
@@ -49,6 +56,15 @@ class NautobotTestRunner(DiscoverRunner):
 
     exclude_tags = ["integration"]
 
+    @classmethod
+    def add_arguments(cls, parser):
+        super().add_arguments(parser)
+        parser.add_argument(
+            "--cache-test-fixtures",
+            action="store_true",
+            help="Save test database to a json fixture file to re-use on subsequent tests.",
+        )
+
     def __init__(self, cache_test_fixtures=False, **kwargs):
         self.cache_test_fixtures = cache_test_fixtures
 
@@ -64,15 +80,6 @@ class NautobotTestRunner(DiscoverRunner):
 
         super().__init__(**kwargs)
 
-    @classmethod
-    def add_arguments(cls, parser):
-        super().add_arguments(parser)
-        parser.add_argument(
-            "--cache-test-fixtures",
-            action="store_true",
-            help="Save test database to a json fixture file to re-use on subsequent tests.",
-        )
-
     def setup_test_environment(self, **kwargs):
         super().setup_test_environment(**kwargs)
         # Remove 'testserver' that Django "helpfully" adds automatically to ALLOWED_HOSTS, masking issues like #3065
@@ -91,6 +98,13 @@ class NautobotTestRunner(DiscoverRunner):
 
         old_names = []
 
+        # Nautobot specific - disable coverage measurement to improve performance of (slow) database setup
+        cov = None
+        if has_coverage:
+            cov = Coverage.current()
+        if cov is not None:
+            cov.stop()
+
         for db_name, aliases in test_databases.values():
             first_alias = None
             for alias in aliases:
@@ -150,6 +164,10 @@ class NautobotTestRunner(DiscoverRunner):
             for alias in connections:
                 connections[alias].force_debug_cursor = True
 
+        # Nautobot specific - resume test coverage measurement
+        if cov is not None:
+            cov.start()
+
         return old_names
 
     def teardown_databases(self, old_config, **kwargs):

nautobot/core/tests/test_utils.py

@@ -234,6 +234,19 @@ class GetFooForModelTest(TestCase):
         self.assertEqual(lookup.get_model_from_name("dcim.device"), dcim_models.Device)
         self.assertEqual(lookup.get_model_from_name("dcim.location"), dcim_models.Location)
 
+    def test_get_model_for_view_name(self):
+        """
+        Test the util function `get_model_for_view_name` returns the appropriate Model, if the colon separated view name provided.
+        """
+        with self.subTest("Test core view."):
+            self.assertEqual(lookup.get_model_for_view_name("dcim:device_list"), dcim_models.Device)
+        with self.subTest("Test app view."):
+            self.assertEqual(lookup.get_model_for_view_name("plugins:example_app:examplemodel_list"), ExampleModel)
+        with self.subTest("Test unexpected view."):
+            with self.assertRaises(ValueError) as err:
+                lookup.get_model_for_view_name("unknown:plugins:example_app:examplemodel_list")
+            self.assertEqual(str(err.exception), "Unexpected View Name: unknown:plugins:example_app:examplemodel_list")
+
 
 class IsTaggableTest(TestCase):
     def test_is_taggable_true(self):

nautobot/core/utils/lookup.py

@@ -213,7 +213,13 @@ def get_model_for_view_name(view_name):
     Return the model class associated with the given view_name e.g. "circuits:circuit_detail", "dcim:device_list" and etc.
     If the app_label or model_name contained by the given view_name is invalid, this will return `None`.
     """
-    app_label, model_name = view_name.split(":")  # dcim, device_list
+    split_view_name = view_name.split(":")
+    if len(split_view_name) == 2:
+        app_label, model_name = split_view_name  # dcim, device_list
+    elif len(split_view_name) == 3:
+        _, app_label, model_name = split_view_name  # plugins, app_name, model_list
+    else:
+        raise ValueError(f"Unexpected View Name: {view_name}")
     model_name = model_name.split("_")[0]  # device
 
     try:

nautobot/core/views/utils.py

@@ -337,7 +337,7 @@ def common_detail_view_context(request, instance):
     context["created_by"] = created_by
     context["last_updated_by"] = last_updated_by
 
-    if instance.is_contact_associable_model:
+    if getattr(instance, "is_contact_associable_model", False):
         paginate = {"paginator_class": EnhancedPaginator, "per_page": get_paginate_count(request)}
         associations = instance.associated_contacts.restrict(request.user, "view").order_by("role__name")
         associations_table = AssociatedContactsTable(associations, orderable=False)
@@ -347,7 +347,7 @@ def common_detail_view_context(request, instance):
     else:
         context["associated_contacts_table"] = None
 
-    if instance.is_dynamic_group_associable_model:
+    if getattr(instance, "is_dynamic_group_associable_model", False):
         paginate = {"paginator_class": EnhancedPaginator, "per_page": get_paginate_count(request)}
         dynamic_groups = instance.dynamic_groups.restrict(request.user, "view")
         dynamic_groups_table = DynamicGroupTable(dynamic_groups, orderable=False)
@@ -358,7 +358,7 @@ def common_detail_view_context(request, instance):
     else:
         context["associated_dynamic_groups_table"] = None
 
-    if instance.is_metadata_associable_model:
+    if getattr(instance, "is_metadata_associable_model", False):
         paginate = {"paginator_class": EnhancedPaginator, "per_page": get_paginate_count(request)}
         object_metadata = instance.associated_object_metadata.restrict(request.user, "view").order_by(
             "metadata_type", "scoped_fields"

nautobot/dcim/factory.py

@@ -110,7 +110,7 @@ NETWORK_DRIVERS = {
     "Palo Alto": ["paloalto_panos"],
 }
 
-TIME_ZONES = {timezone for timezone, _ in TimeZoneFormField().choices}
+TIME_ZONES = sorted(timezone for timezone, _ in TimeZoneFormField().choices)
 
 
 # Retrieve correct rack reservation units
@@ -296,7 +296,7 @@ class DeviceTypeFactory(PrimaryModelFactory):
         while not unused_models:
             unused_models = {f"{device_type} {count}" for device_type in device_types}.difference(current_models)
             count += 1
-        return factory.random.randgen.choice(list(unused_models))
+        return factory.random.randgen.choice(sorted(unused_models))
 
     has_part_number = NautobotBoolIterator()
     part_number = factory.Maybe("has_part_number", factory.Faker("ean", length=8), "")
@@ -784,7 +784,7 @@ class ModuleTypeFactory(PrimaryModelFactory):
         while not unused_models:
             unused_models = {f"{module_type} {count}" for module_type in module_types}.difference(current_models)
             count += 1
-        return factory.random.randgen.choice(list(unused_models))
+        return factory.random.randgen.choice(sorted(unused_models))
 
 
 class ModuleFactory(PrimaryModelFactory):

nautobot/dcim/tables/devices.py

@@ -396,7 +396,7 @@ class DeviceModuleConsolePortTable(ConsolePortTable):
             "actions",
         )
         row_attrs = {
-            "style": cable_status_color_css,
+            "class": cable_status_color_css,
         }
 
 
@@ -460,7 +460,7 @@ class DeviceModuleConsoleServerPortTable(ConsoleServerPortTable):
             "actions",
         )
         row_attrs = {
-            "style": cable_status_color_css,
+            "class": cable_status_color_css,
         }
 
 
@@ -535,7 +535,7 @@ class DeviceModulePowerPortTable(PowerPortTable):
             "connection",
             "actions",
         )
-        row_attrs = {"style": cable_status_color_css}
+        row_attrs = {"class": cable_status_color_css}
 
 
 class PowerOutletTable(ModularDeviceComponentTable, PathEndpointTable):
@@ -613,7 +613,7 @@ class DeviceModulePowerOutletTable(PowerOutletTable):
             "connection",
             "actions",
         )
-        row_attrs = {"style": cable_status_color_css}
+        row_attrs = {"class": cable_status_color_css}
 
 
 class BaseInterfaceTable(BaseTable):
@@ -739,7 +739,7 @@ class DeviceModuleInterfaceTable(InterfaceTable):
             "actions",
         ]
         row_attrs = {
-            "style": cable_status_color_css,
+            "class": cable_status_color_css,
             "data-name": lambda record: record.name,
         }
 
@@ -815,7 +815,7 @@ class DeviceModuleFrontPortTable(FrontPortTable):
             "cable_peer",
             "actions",
         )
-        row_attrs = {"style": cable_status_color_css}
+        row_attrs = {"class": cable_status_color_css}
 
 
 class RearPortTable(ModularDeviceComponentTable, CableTerminationTable):
@@ -874,7 +874,7 @@ class DeviceModuleRearPortTable(RearPortTable):
             "cable_peer",
             "actions",
         )
-        row_attrs = {"style": cable_status_color_css}
+        row_attrs = {"class": cable_status_color_css}
 
 
 class DeviceBayTable(DeviceComponentTable):

nautobot/dcim/templates/dcim/device.html

@@ -406,6 +406,18 @@
 {% endif %}
 {% if object.is_dynamic_group_associable_model and perms.extras.view_dynamicgroup %}
     <div id="dynamic_groups" role="tabpanel" class="tab-pane {% if request.GET.tab == 'dynamic_groups' %}active{% else %}fade{% endif %}">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="alert alert-warning">
+                    Dynamic group membership is cached for performance reasons,
+                    therefore this table may not always be up-to-date.
+                    <br>You can refresh the membership of any specific group by navigating to it from the list below
+                    or from the <a href="{% url 'extras:dynamicgroup_list' %}">Dynamic Groups list view</a>.
+                    <br>You can also refresh the membership of all groups by running the
+                    <a href="{% url 'extras:job_run_by_class_path' class_path='nautobot.core.jobs.groups.RefreshDynamicGroupCaches' %}">Refresh Dynamic Group Caches job</a>.
+                </div>
+            </div>
+        </div>
         <div class="row">
             <div class="col-md-12">
                 <form method="post">

nautobot/dcim/templates/dcim/softwareimagefile_retrieve.html

@@ -215,6 +215,18 @@
         {% endif %}
         {% if object.is_dynamic_group_associable_model and perms.extras.view_dynamicgroup %}
             <div id="dynamic_groups" role="tabpanel" class="tab-pane {% if request.GET.tab == 'dynamic_groups' %}active{% else %}fade{% endif %}">
+                <div class="row">
+                    <div class="col-md-12">
+                        <div class="alert alert-warning">
+                            Dynamic group membership is cached for performance reasons,
+                            therefore this table may not always be up-to-date.
+                            <br>You can refresh the membership of any specific group by navigating to it from the list below
+                            or from the <a href="{% url 'extras:dynamicgroup_list' %}">Dynamic Groups list view</a>.
+                            <br>You can also refresh the membership of all groups by running the
+                            <a href="{% url 'extras:job_run_by_class_path' class_path='nautobot.core.jobs.groups.RefreshDynamicGroupCaches' %}">Refresh Dynamic Group Caches job</a>.
+                        </div>
+                    </div>
+                </div>
                 <div class="row">
                     <div class="col-md-12">
                         <form method="post">

nautobot/dcim/utils.py

@@ -14,7 +14,7 @@ from netutils.lib_mapper import (
     SCRAPLI_LIB_MAPPER_REVERSE,
 )
 
-from nautobot.core.utils.color import hex_to_rgb, lighten_color, rgb_to_hex
+from nautobot.core.choices import ColorChoices
 from nautobot.core.utils.config import get_settings_or_config
 from nautobot.dcim.choices import InterfaceModeChoices
 from nautobot.dcim.constants import NETUTILS_NETWORK_DRIVER_MAPPING_NAMES
@@ -55,11 +55,14 @@ def cable_status_color_css(record):
     """
     if not record.cable:
         return ""
-    # The status colors are for use with labels and such, and tend to be quite bright.
-    # For this function we want a much milder, mellower color suitable as a row background.
-    base_color = record.cable.get_status_color().strip("#")
-    lighter_color = rgb_to_hex(*lighten_color(*hex_to_rgb(base_color), 0.75))
-    return f"background-color: #{lighter_color}"
+    else:
+        CABLE_STATUS_TO_CSS_CLASS = {
+            ColorChoices.COLOR_GREEN: "success",
+            ColorChoices.COLOR_AMBER: "warning",
+            ColorChoices.COLOR_CYAN: "info",
+        }
+        status_color = record.cable.get_status_color().strip("#")
+        return CABLE_STATUS_TO_CSS_CLASS.get(status_color, "")
 
 
 def get_network_driver_mapping_tool_names():

nautobot/extras/api/serializers.py

@@ -6,6 +6,7 @@ from django.core.exceptions import ObjectDoesNotExist
 from drf_spectacular.utils import extend_schema_field
 from rest_framework import serializers
 from rest_framework.validators import UniqueTogetherValidator
+from timezone_field.rest_framework import TimeZoneSerializerField
 
 from nautobot.core.api import (
     BaseModelSerializer,
@@ -581,6 +582,7 @@ class JobVariableSerializer(serializers.Serializer):
 
 class ScheduledJobSerializer(BaseModelSerializer):
     # start_time = serializers.DateTimeField(format=None, required=False)
+    time_zone = TimeZoneSerializerField(required=False)
 
     class Meta:
         model = ScheduledJob

nautobot/extras/context_managers.py

@@ -175,11 +175,12 @@ def web_request_context(
     :param user: User object
     :param context_detail: Optional extra details about the transaction (ex: the plugin name that initiated the change)
     :param change_id: Optional uuid object to uniquely identify the transaction. One will be generated if not supplied
-    :param context: Optional string value of the generated change log entries' "change_context" field, defaults to ObjectChangeEventContextChoices.CONTEXT_ORM.
-        Valid choices are in nautobot.extras.choices.ObjectChangeEventContextChoices
+    :param context: Optional string value of the generated change log entries' "change_context" field.
+        Defaults to `ObjectChangeEventContextChoices.CONTEXT_ORM`.
+        Valid choices are in `nautobot.extras.choices.ObjectChangeEventContextChoices`.
     :param request: Optional web request instance, one will be generated if not supplied
     """
-    from nautobot.extras.jobs import enqueue_job_hooks  # prevent circular import
+    from nautobot.extras.jobs import enqueue_job_hooks, get_jobs  # prevent circular import
 
     valid_contexts = {
         ObjectChangeEventContextChoices.CONTEXT_JOB: JobChangeContext,
@@ -202,9 +203,15 @@ def web_request_context(
         with change_logging(change_context):
             yield request
     finally:
+        jobs_refreshed = False
         # enqueue jobhooks and webhooks, use change_context.change_id in case change_id was not supplied
         for object_change in ObjectChange.objects.filter(request_id=change_context.change_id).iterator():
-            enqueue_job_hooks(object_change)
+            if context != ObjectChangeEventContextChoices.CONTEXT_JOB_HOOK:
+                # Make sure JobHooks are up to date (once) before calling them
+                if not jobs_refreshed:
+                    get_jobs(reload=True)
+                    jobs_refreshed = True
+                enqueue_job_hooks(object_change)
             enqueue_webhooks(object_change)
 
 

nautobot/extras/filters/__init__.py

@@ -6,6 +6,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.db.models import Q
 import django_filters
 from drf_spectacular.utils import extend_schema_field
+from timezone_field import TimeZoneField
 
 from nautobot.core.api.exceptions import SerializerNotFound
 from nautobot.core.api.utils import get_serializer_for_model
@@ -911,6 +912,7 @@ class JobResultFilterSet(BaseFilterSet, CustomFieldModelFilterSetMixin):
             "job_model__name": "icontains",
             "name": "icontains",
             "user__username": "icontains",
+            "scheduled_job__name": "icontains",
         },
     )
     job_model = NaturalKeyOrPKMultipleChoiceFilter(
@@ -922,11 +924,16 @@ class JobResultFilterSet(BaseFilterSet, CustomFieldModelFilterSetMixin):
         queryset=Job.objects.all(),
         label="Job (ID) - Deprecated (use job_model filter)",
     )
+    scheduled_job = NaturalKeyOrPKMultipleChoiceFilter(
+        to_field_name="name",
+        queryset=ScheduledJob.objects.all(),
+        label="Scheduled Job (name or ID)",
+    )
     status = django_filters.MultipleChoiceFilter(choices=JobResultStatusChoices, null_value=None)
 
     class Meta:
         model = JobResult
-        fields = ["id", "date_created", "date_done", "name", "status", "user"]
+        fields = ["id", "date_created", "date_done", "name", "status", "user", "scheduled_job"]
 
 
 class JobLogEntryFilterSet(BaseFilterSet):
@@ -960,10 +967,15 @@ class ScheduledJobFilterSet(BaseFilterSet):
         queryset=Job.objects.all(),
         label="Job (ID) - Deprecated (use job_model filter)",
     )
+    time_zone = django_filters.MultipleChoiceFilter(
+        choices=[(str(obj), name) for obj, name in TimeZoneField().choices],
+        label="Time zone",
+        null_value="",
+    )
 
     class Meta:
         model = ScheduledJob
-        fields = ["id", "name", "total_run_count", "start_time", "last_run_at"]
+        fields = ["id", "name", "total_run_count", "start_time", "last_run_at", "time_zone"]
 
 
 #

nautobot/extras/forms/forms.py

@@ -1286,6 +1286,12 @@ class JobResultFilterForm(BootstrapMixin, forms.Form):
         required=False,
         widget=StaticSelect2Multiple(),
     )
+    scheduled_job = DynamicModelMultipleChoiceField(
+        label="Scheduled Job",
+        queryset=ScheduledJob.objects.all(),
+        required=False,
+        to_field_name="name",
+    )
 
 
 class ScheduledJobFilterForm(BootstrapMixin, forms.Form):

nautobot/extras/forms/mixins.py

@@ -174,7 +174,7 @@ class DynamicGroupModelFormMixin(forms.ModelForm):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        if self._meta.model.is_dynamic_group_associable_model:
+        if getattr(self._meta.model, "is_dynamic_group_associable_model", False):
             self.fields["dynamic_groups"] = DynamicModelMultipleChoiceField(
                 required=False,
                 initial=self.instance.dynamic_groups if self.instance else None,
@@ -193,7 +193,7 @@ class DynamicGroupModelFormMixin(forms.ModelForm):
 
     def save(self, commit=True):
         obj = super().save(commit=commit)
-        if commit and obj.is_dynamic_group_associable_model:
+        if commit and getattr(obj, "is_dynamic_group_associable_model", False):
             current_groups = set(obj.dynamic_groups.filter(group_type=DynamicGroupTypeChoices.TYPE_STATIC))
             for dynamic_group in set(self.cleaned_data.get("dynamic_groups")).difference(current_groups):
                 dynamic_group.add_members([obj])

nautobot/extras/jobs.py

@@ -1168,7 +1168,6 @@ def enqueue_job_hooks(object_change):
     job_hooks = JobHook.objects.filter(content_types=content_type, enabled=True, **{action_flag: True})
 
     # Enqueue the jobs related to the job_hooks
-    get_jobs(reload=True)
     for job_hook in job_hooks:
         job_model = job_hook.job
         if not job_model.installed or not job_model.enabled:

nautobot/extras/management/__init__.py

@@ -32,6 +32,7 @@ STATUS_CHOICESET_MAP = {
     "ipam.IPAddress": ipam_choices.IPAddressStatusChoices,
     "ipam.Prefix": ipam_choices.PrefixStatusChoices,
     "ipam.VLAN": ipam_choices.VLANStatusChoices,
+    "ipam.VRF": ipam_choices.VRFStatusChoices,
     "virtualization.VirtualMachine": vm_choices.VirtualMachineStatusChoices,
     "virtualization.VMInterface": vm_choices.VMInterfaceStatusChoices,
 }
@@ -48,6 +49,7 @@ STATUS_COLOR_MAP = {
     "Decommissioning": ColorChoices.COLOR_AMBER,
     "Deprecated": ColorChoices.COLOR_RED,
     "Deprovisioning": ColorChoices.COLOR_AMBER,
+    "Down": ColorChoices.COLOR_AMBER,
     "End-of-Life": ColorChoices.COLOR_RED,
     "Extended Support": ColorChoices.COLOR_CYAN,
     "Failed": ColorChoices.COLOR_RED,
@@ -76,6 +78,7 @@ STATUS_DESCRIPTION_MAP = {
     "Decommissioning": "Unit is being decommissioned",
     "Deprecated": "Unit has been deprecated",
     "Deprovisioning": "Circuit is being deprovisioned",
+    "Down": "VRF is down",
     "End-of-Life": "Unit has reached end-of-life",
     "Extended Support": "Software is in extended support",
     "Failed": "Unit has failed",

nautobot/extras/migrations/0115_scheduledjob_time_zone.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.15 on 2024-08-19 13:44
+
+from django.db import migrations
+from django.utils import timezone
+import timezone_field.fields
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("extras", "0114_computedfield_grouping"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="scheduledjob",
+            name="time_zone",
+            field=timezone_field.fields.TimeZoneField(default=timezone.get_default_timezone_name),
+        ),
+        migrations.AlterModelOptions(
+            name="scheduledjob",
+            options={"ordering": ["name"]},
+        ),
+    ]

nautobot/extras/models/groups.py

@@ -251,7 +251,10 @@ class DynamicGroup(PrimaryModel):
             # Skip filter fields that have methods defined. They are not reversible.
             if skip_method_filters and filterset_field.method is not None:
                 # Don't skip method fields that also have a "generate_query_" method
-                if hasattr(filterset, "generate_query_" + filterset_field.method):
+                query_attr = (
+                    filterset_field.method.__name__ if callable(filterset_field.method) else filterset_field.method
+                )
+                if hasattr(filterset, f"generate_query_{query_attr}"):
                     logger.debug(
                         "Keeping %s for filterform: has a `generate_query_` filter method", filterset_field_name
                     )