nautobot 2.3.8__py3-none-any.whl → 2.3.9__py3-none-any.whl

nautobot/apps/tables.py

@@ -15,6 +15,7 @@ from nautobot.core.tables import (
     TagColumn,
     ToggleColumn,
 )
+from nautobot.extras.plugins import TableExtension
 from nautobot.extras.tables import RoleTableMixin, StatusTableMixin
 
 __all__ = (
@@ -32,5 +33,6 @@ __all__ = (
     "RoleTableMixin",
     "StatusTableMixin",
     "TagColumn",
+    "TableExtension",
     "ToggleColumn",
 )

nautobot/core/forms/__init__.py

@@ -7,6 +7,8 @@ from nautobot.core.forms.constants import (
     NUMERIC_EXPANSION_PATTERN,
 )
 from nautobot.core.forms.fields import (
+    AutoPositionField,
+    AutoPositionPatternField,
     CommentField,
     CSVChoiceField,
     CSVContentTypeField,
@@ -80,6 +82,8 @@ __all__ = (
     "ALPHANUMERIC_EXPANSION_PATTERN",
     "APISelect",
     "APISelectMultiple",
+    "AutoPositionField",
+    "AutoPositionPatternField",
     "BOOLEAN_CHOICES",
     "BOOLEAN_WITH_BLANK_CHOICES",
     "BootstrapMixin",

nautobot/core/forms/fields.py

@@ -444,6 +444,38 @@ class SlugField(django_forms.SlugField):
         self.widget.attrs["slug-source"] = slug_source
 
 
+class AutoPositionField(django_forms.CharField):
+    def __init__(self, source="name", *args, **kwargs):
+        """
+        Instantiate a AutoPositionField.
+
+        Args:
+            source (str, tuple): Name of the field (or a list of field names) that will be used to suggest a position.
+        """
+        kwargs.setdefault("label", "Position")
+        kwargs.setdefault("widget", forms.SlugWidget)
+        super().__init__(*args, **kwargs)
+        if isinstance(source, (tuple, list)):
+            source = " ".join(source)
+        self.widget.attrs["source"] = source
+
+
+class AutoPositionPatternField(ExpandableNameField):
+    def __init__(self, source="name_pattern", *args, **kwargs):
+        """
+        Instantiate a AutoPositionPatternField.
+
+        Args:
+            source (str, tuple): Name pattern of the field (or a list of field names) that will be used to suggest a position pattern.
+        """
+        kwargs.setdefault("label", "Position")
+        kwargs.setdefault("widget", forms.SlugWidget)
+        super().__init__(*args, **kwargs)
+        if isinstance(source, (tuple, list)):
+            source = " ".join(source)
+        self.widget.attrs["source"] = source
+
+
 class DynamicModelChoiceMixin:
     """
     :param display_field: The name of the attribute of an API response object to display in the selection list

nautobot/core/jobs/__init__.py

@@ -19,7 +19,12 @@ from nautobot.core.jobs.cleanup import LogsCleanup
 from nautobot.core.jobs.groups import RefreshDynamicGroupCaches
 from nautobot.core.utils.lookup import get_filterset_for_model
 from nautobot.core.utils.requests import get_filterable_params_from_filter_params
-from nautobot.extras.datasources import ensure_git_repository, git_repository_dry_run, refresh_datasource_content
+from nautobot.extras.datasources import (
+    ensure_git_repository,
+    git_repository_dry_run,
+    refresh_datasource_content,
+    refresh_job_code_from_repository,
+)
 from nautobot.extras.jobs import BooleanVar, ChoiceVar, FileVar, Job, ObjectVar, RunJobTaskFailed, StringVar, TextVar
 from nautobot.extras.models import ExportTemplate, GitRepository
 
@@ -49,13 +54,24 @@ class GitRepositorySync(Job):
         self.logger.info(f'Creating/refreshing local copy of Git repository "{repository.name}"...')
 
         try:
-            ensure_git_repository(repository, logger=self.logger)
-            refresh_datasource_content("extras.gitrepository", repository, user, job_result, delete=False)
-            # Given that the above succeeded, tell all workers (including ourself) to call ensure_git_repository()
-            app.control.broadcast("refresh_git_repository", repository_pk=repository.pk, head=repository.current_head)
-        finally:
-            if job_result.duration:
-                self.logger.info("Repository synchronization completed in %s", job_result.duration)
+            with transaction.atomic():
+                ensure_git_repository(repository, logger=self.logger)
+                refresh_datasource_content("extras.gitrepository", repository, user, job_result, delete=False)
+                # Given that the above succeeded, tell all workers (including ourself) to call ensure_git_repository()
+                app.control.broadcast(
+                    "refresh_git_repository", repository_pk=repository.pk, head=repository.current_head
+                )
+                if job_result.duration:
+                    self.logger.info("Repository synchronization completed in %s", job_result.duration)
+        except Exception:
+            job_result.log("Changes to database records have been reverted.")
+            # Re-check-out previous commit if any
+            repository.refresh_from_db()
+            if repository.current_head:
+                job_result.log(f"Attempting to revert local repository clone to commit {repository.current_head}")
+                ensure_git_repository(repository, logger=self.logger, head=repository.current_head)
+                refresh_job_code_from_repository(repository.slug, ignore_import_errors=True)
+            raise
 
 
 class GitRepositoryDryRun(Job):

nautobot/core/models/tree_queries.py

@@ -1,9 +1,11 @@
 from django.core.cache import cache
 from django.db.models import Case, When
+from django.db.models.signals import post_delete, post_save
 from tree_queries.models import TreeNode
 from tree_queries.query import TreeManager as TreeManager_, TreeQuerySet as TreeQuerySet_
 
 from nautobot.core.models import BaseManager, querysets
+from nautobot.core.signals import invalidate_max_depth_cache
 
 
 class TreeQuerySet(TreeQuerySet_, querysets.RestrictedQuerySet):
@@ -117,3 +119,9 @@ class TreeModel(TreeNode):
         display_str += self.name
         cache.set(cache_key, display_str, 5)
         return display_str
+
+    @classmethod
+    def __init_subclass__(cls, **kwargs):
+        super().__init_subclass__(**kwargs)
+        post_save.connect(invalidate_max_depth_cache, sender=cls)
+        post_delete.connect(invalidate_max_depth_cache, sender=cls)

nautobot/core/settings.py

@@ -418,7 +418,14 @@ if "NAUTOBOT_ALLOWED_HOSTS" in os.environ and os.environ["NAUTOBOT_ALLOWED_HOSTS
     ALLOWED_HOSTS = os.environ["NAUTOBOT_ALLOWED_HOSTS"].split(" ")
 else:
     ALLOWED_HOSTS = []
+
+# Allow CSRF trusted origins to be set via an environment variable
+# This allows Nautobot to be run behind a reverse proxy that terminates TLS
+# and fix potential issues with CSRF validation
 CSRF_TRUSTED_ORIGINS = []
+if "NAUTOBOT_CSRF_TRUSTED_ORIGINS" in os.environ and os.environ["NAUTOBOT_CSRF_TRUSTED_ORIGINS"] != "":
+    CSRF_TRUSTED_ORIGINS = os.getenv("NAUTOBOT_CSRF_TRUSTED_ORIGINS", "").split(_CONFIG_SETTING_SEPARATOR)
+
 CSRF_FAILURE_VIEW = "nautobot.core.views.csrf_failure"
 DATE_FORMAT = os.getenv("NAUTOBOT_DATE_FORMAT", "N j, Y")
 DATETIME_FORMAT = os.getenv("NAUTOBOT_DATETIME_FORMAT", "N j, Y g:i a")

nautobot/core/settings.yaml

@@ -587,6 +587,16 @@ properties:
     description: >-
       A list of hosts (fully-qualified domain names (FQDNs) or subdomains) that are considered trusted origins
       for cross-site secure requests such as HTTPS POST.
+
+      You might need to set this if you are using a reverse proxy or load balancer that changes the host header or if you face the error
+      'Invalid Form Submission - CSRF failure has occured' and 'Origin checking failed - https://subdomain.example.com does not match any trusted origins.'
+
+      Example:
+
+      ```python
+      CSRF_TRUSTED_ORIGINS = ['https://subdomain.example.com', 'https://*.example.com']
+      ```
+    environment_variable: "NAUTOBOT_CSRF_TRUSTED_ORIGINS"
     items:
       type: "string"
     see_also:

nautobot/core/signals.py

@@ -7,7 +7,6 @@ import logging
 
 from django.contrib.auth.signals import user_logged_in, user_logged_out
 from django.core.cache import cache
-from django.db.models.signals import post_delete, post_save
 from django.dispatch import receiver, Signal
 import redis.exceptions
 
@@ -62,10 +61,12 @@ def disable_for_loaddata(signal_handler):
     return wrapper
 
 
-@receiver(post_save)
-@receiver(post_delete)
 def invalidate_max_depth_cache(sender, **kwargs):
-    """Clear the appropriate TreeManager.max_depth cache as the create/update/delete may have changed the tree."""
+    """
+    Clear the appropriate TreeManager.max_depth cache as the create/update/delete may have changed the tree.
+
+    Note that this signal is connected in `TreeModel.__init_subclass__()` so as to only apply to those models.
+    """
     from nautobot.core.models.tree_queries import TreeManager
 
     if not isinstance(sender.objects, TreeManager):

nautobot/core/templates/nautobot_config.py.j2

@@ -94,9 +94,13 @@ SECRET_KEY = os.getenv("NAUTOBOT_SECRET_KEY", "{{ secret_key }}")
 # FQDNs that are considered trusted origins for secure, cross-domain, requests such as HTTPS POST.
 # If running Nautobot under a single domain, you may not need to set this variable;
 # if running on multiple domains, you *may* need to set this variable to more or less the same as ALLOWED_HOSTS above.
+# You also want to set this variable if you are facing CSRF validation issues such as 
+# 'CSRF failure has occured' or 'Origin checking failed - https://subdomain.example.com does not match any trusted origins.'
 # https://docs.djangoproject.com/en/stable/ref/settings/#csrf-trusted-origins
 #
 # CSRF_TRUSTED_ORIGINS = []
+# if "NAUTOBOT_CSRF_TRUSTED_ORIGINS" in os.environ and os.environ["NAUTOBOT_CSRF_TRUSTED_ORIGINS"] != "":
+#    CSRF_TRUSTED_ORIGINS = os.getenv("NAUTOBOT_CSRF_TRUSTED_ORIGINS", "").split(_CONFIG_SETTING_SEPARATOR)
 
 # Date/time formatting. See the following link for supported formats:
 # https://docs.djangoproject.com/en/stable/ref/templates/builtins/#date

nautobot/dcim/forms.py

@@ -13,6 +13,8 @@ from nautobot.core.forms import (
     add_blank_choice,
     APISelect,
     APISelectMultiple,
+    AutoPositionField,
+    AutoPositionPatternField,
     BootstrapMixin,
     BulkEditNullBooleanSelect,
     ColorSelect,
@@ -269,23 +271,7 @@ class ComponentForm(BootstrapMixin, forms.Form):
 
 
 class ModularComponentForm(ComponentForm):
-    name_pattern = ExpandableNameField(
-        label="Name",
-        help_text="""
-            Alphanumeric ranges are supported for bulk creation. Mixed cases and types within a single range
-            are not supported. Examples:
-            <ul>
-                <li><code>[ge,xe]-0/0/[0-9]</code></li>
-                <li><code>e[0-3][a-d,f]</code></li>
-            </ul>
-
-            The variables <code>{module}</code>, <code>{module.parent}</code>, <code>{module.parent.parent}</code>, etc.
-            may be used in the name field and will be replaced by the <code>position</code> of the module bay that the
-            module occupies (skipping over any bays with a blank <code>position</code>). These variables can be used
-            multiple times in the component name and there is no limit to the depth of parent levels.
-            Any variables that cannot be replaced by a suitable position value will remain unchanged.
-                """,
-    )
+    """Base class for forms for components that can be assigned to either a device or a module."""
 
 
 #
@@ -1064,11 +1050,27 @@ class ComponentTemplateCreateForm(ComponentForm):
     description = forms.CharField(required=False)
 
 
-class ModularComponentTemplateCreateForm(ModularComponentForm):
+class ModularComponentTemplateCreateForm(ComponentTemplateCreateForm):
     """
     Base form for the creation of modular device component templates (subclassed from ModularComponentTemplateModel).
     """
 
+    name_pattern = ExpandableNameField(
+        label="Name",
+        help_text="""
+        Alphanumeric ranges are supported for bulk creation. Mixed cases and types within a single range
+        are not supported. Examples:
+        <ul>
+            <li><code>[ge,xe]-0/0/[0-9]</code></li>
+            <li><code>e[0-3][a-d,f]</code></li>
+        </ul>
+
+        The variables <code>{module}</code>, <code>{module.parent}</code>, <code>{module.parent.parent}</code>, etc.
+        may be used in the name field and will be replaced by the <code>position</code> of the module bay that the
+        module occupies (skipping over any bays with a blank <code>position</code>). These variables can be used
+        multiple times in the component name and there is no limit to the depth of parent levels.
+        Any variables that cannot be replaced by a suitable position value will remain unchanged.""",
+    )
     device_type = DynamicModelChoiceField(
         queryset=DeviceType.objects.all(),
         required=False,
@@ -1077,7 +1079,6 @@ class ModularComponentTemplateCreateForm(ModularComponentForm):
         queryset=ModuleType.objects.all(),
         required=False,
     )
-    description = forms.CharField(required=False)
 
 
 class ConsolePortTemplateForm(ModularComponentTemplateForm):
@@ -1570,10 +1571,10 @@ class ModuleBayBaseCreateForm(BootstrapMixin, forms.Form):
         required=False,
         help_text="Alphanumeric ranges are supported. (Must match the number of names being created.)",
     )
-    position_pattern = ExpandableNameField(
-        label="Position",
+    position_pattern = AutoPositionPatternField(
         required=False,
-        help_text="Alphanumeric ranges are supported. (Must match the number of names being created.)",
+        help_text="Alphanumeric ranges are supported. (Must match the number of names being created.)"
+        " Default to the names of the module bays unless manually supplied by the user.",
     )
     description = forms.CharField(max_length=CHARFIELD_MAX_LENGTH, required=False)
 
@@ -2542,12 +2543,8 @@ class DeviceBulkAddComponentForm(ComponentForm, CustomFieldModelBulkEditFormMixi
         nullable_fields = []
 
 
-class ModuleBulkAddComponentForm(ModularComponentForm, CustomFieldModelBulkEditFormMixin):
+class ModuleBulkAddComponentForm(DeviceBulkAddComponentForm):
     pk = forms.ModelMultipleChoiceField(queryset=Module.objects.all(), widget=forms.MultipleHiddenInput())
-    description = forms.CharField(max_length=CHARFIELD_MAX_LENGTH, required=False)
-
-    class Meta:
-        nullable_fields = []
 
 
 #
@@ -3566,6 +3563,12 @@ class ModuleBayFilterForm(NautobotFilterForm):
 
 
 class ModuleBayForm(NautobotModelForm):
+    position = AutoPositionField(
+        max_length=CHARFIELD_MAX_LENGTH,
+        help_text="The position of the module bay within the parent device/module. "
+        "Defaults to the name of the module bay unless overridden.",
+        required=False,
+    )
     parent_device = DynamicModelChoiceField(
         queryset=Device.objects.all(),
         required=False,

nautobot/dcim/models/device_components.py

@@ -1280,3 +1280,8 @@ class ModuleBay(PrimaryModel):
 
         if not (self.parent_device or self.parent_module):
             raise ValidationError("Either parent_device or parent_module must be set")
+
+        # Populate the position field with the name of the module bay if it is not supplied by the user.
+
+        if not self.position:
+            self.position = self.name

nautobot/dcim/tables/devices.py

@@ -173,6 +173,7 @@ class DeviceTable(StatusTableMixin, RoleTableMixin, BaseTable):
         template_code="""{% if record.device_redundancy_group %}<span class="badge badge-default">{{ record.device_redundancy_group_priority|default:'None' }}</span>{% else %}—{% endif %}"""
     )
     controller_managed_device_group = tables.Column(linkify=True)
+    software_version = tables.Column(linkify=True, verbose_name="Software Version")
     secrets_group = tables.Column(linkify=True)
     tags = TagColumn(url_name="dcim:device_list")
 
@@ -201,6 +202,7 @@ class DeviceTable(StatusTableMixin, RoleTableMixin, BaseTable):
             "vc_priority",
             "device_redundancy_group",
             "device_redundancy_group_priority",
+            "software_version",
             "controller_managed_device_group",
             "secrets_group",
             "tags",
@@ -616,7 +618,7 @@ class DeviceModulePowerOutletTable(PowerOutletTable):
         row_attrs = {"class": cable_status_color_css}
 
 
-class BaseInterfaceTable(BaseTable):
+class BaseInterfaceTable(StatusTableMixin, RoleTableMixin, BaseTable):
     enabled = BooleanColumn()
     ip_addresses = tables.TemplateColumn(
         template_code=INTERFACE_IPADDRESSES,
@@ -632,7 +634,7 @@ class BaseInterfaceTable(BaseTable):
     vrf = tables.Column(linkify=True, verbose_name="VRF")
 
 
-class InterfaceTable(StatusTableMixin, ModularDeviceComponentTable, BaseInterfaceTable, PathEndpointTable):
+class InterfaceTable(ModularDeviceComponentTable, BaseInterfaceTable, PathEndpointTable):
     mgmt_only = BooleanColumn()
     tags = TagColumn(url_name="dcim:interface_list")
 

nautobot/dcim/tests/test_models.py

@@ -2849,6 +2849,22 @@ class ModuleBayTestCase(ModularDeviceComponentTestCaseMixin, ModelTestCases.Base
         self.assertIsNone(child_module_bay.parent)
         self.assertIsNone(grandchild_module_bay.parent)
 
+    def test_position_value_auto_population(self):
+        """
+        Assert that the value of the module bay position is auto-populated by its name if position is not provided by the user.
+        """
+
+        module_bay = ModuleBay.objects.create(
+            parent_device=self.device,
+            name="1111",
+        )
+        module_bay.validated_save()
+        self.assertEqual(module_bay.position, module_bay.name)
+        # Test the default value is overriden if the user provides a position value.
+        module_bay.position = "1222"
+        module_bay.validated_save()
+        self.assertEqual(module_bay.position, "1222")
+
 
 class ModuleBayTemplateTestCase(ModularDeviceComponentTemplateTestCaseMixin, ModelTestCases.BaseModelTestCase):
     model = ModuleBayTemplate

nautobot/extras/context_managers.py

@@ -180,7 +180,7 @@ def web_request_context(
         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, get_jobs  # prevent circular import
+    from nautobot.extras.jobs import enqueue_job_hooks  # prevent circular import
 
     valid_contexts = {
         ObjectChangeEventContextChoices.CONTEXT_JOB: JobChangeContext,
@@ -203,15 +203,14 @@ def web_request_context(
         with change_logging(change_context):
             yield request
     finally:
-        jobs_refreshed = False
+        jobs_reloaded = 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():
+        for object_change in (
+            ObjectChange.objects.filter(request_id=change_context.change_id).order_by("time").iterator()
+        ):
             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)
+                # Make sure JobHooks are up to date (only once) before calling them
+                jobs_reloaded |= enqueue_job_hooks(object_change, may_reload_jobs=(not jobs_reloaded))
             enqueue_webhooks(object_change)
 
 

nautobot/extras/datasources/__init__.py

@@ -4,6 +4,7 @@ from .git import (
     ensure_git_repository,
     get_repo_access_url,
     git_repository_dry_run,
+    refresh_job_code_from_repository,
 )
 from .registry import (
     get_datasource_content_choices,
@@ -20,4 +21,5 @@ __all__ = (
     "get_repo_access_url",
     "git_repository_dry_run",
     "refresh_datasource_content",
+    "refresh_job_code_from_repository",
 )

nautobot/extras/datasources/git.py

@@ -96,8 +96,11 @@ def get_repo_access_url(repository_record):
                 obj=repository_record,
             )
         except ObjectDoesNotExist:
-            # No defined secret, fall through to legacy behavior
-            pass
+            logger.warning(
+                "HTTP Token not found for secrets group %s associated with repository %s",
+                repository_record.secrets_group,
+                repository_record,
+            )
         try:
             user = repository_record.secrets_group.get_secret_value(
                 SecretsGroupAccessTypeChoices.TYPE_HTTP,
@@ -105,8 +108,12 @@ def get_repo_access_url(repository_record):
                 obj=repository_record,
             )
         except ObjectDoesNotExist:
-            # No defined secret, fall through to legacy behavior
-            pass
+            # May not be needed for this repository, so just log as debug rather than warning
+            logger.debug(
+                "HTTP Username not found for secrets group %s associated with repository %s",
+                repository_record.secrets_group,
+                repository_record,
+            )
 
     if token and token not in from_url:
         # Some git repositories require a user as well as a token.
@@ -147,7 +154,7 @@ def ensure_git_repository(repository_record, logger=None, head=None):  # pylint:
         (bool): Whether any change to the local repo actually occurred.
     """
     # We want to check if the repo is already checked out at head. We also want to avoid calling
-    # get_repo_from_utl_to_path_and_from_branch, because it will cause the URL to be rebuilt causing calls to a secrets
+    # get_repo_from_url_to_path_and_from_branch, because it will cause the URL to be rebuilt causing calls to a secrets
     # backend. As such, if head is None, we can't perform these checks.
     if head is not None:
         # If the repo exists and has HEAD already checked out, the repo is present and has the correct branch selected.
@@ -205,7 +212,6 @@ def git_repository_dry_run(repository_record, logger):  # pylint: disable=redefi
                 logger.info("%s - `%s`", item.status, item.text)
         else:
             logger.info("Repository has no changes")
-
     except Exception as exc:
         logger.error(str(exc))
         raise
@@ -435,19 +441,12 @@ def import_config_context(context_data, repository_record, job_result):
         created = False
         modified = False
         save_needed = False
-        try:
-            context_record = ConfigContext.objects.get(
-                name=context_metadata.get("name"),
-                owner_content_type=git_repository_content_type,
-                owner_object_id=repository_record.pk,
-            )
-        except ConfigContext.DoesNotExist:
-            context_record = ConfigContext(
-                name=context_metadata.get("name"),
-                owner_content_type=git_repository_content_type,
-                owner_object_id=repository_record.pk,
-            )
-            created = True
+        context_record, created = ConfigContext.objects.get_or_create(
+            name=context_metadata.get("name"),
+            owner_content_type=git_repository_content_type,
+            owner_object_id=repository_record.pk,
+            defaults={"data": {}},
+        )
 
         for field in ("weight", "description", "is_active"):
             new_value = context_metadata[field]
@@ -662,20 +661,12 @@ def import_config_context_schema(context_schema_data, repository_record, job_res
 
     schema_metadata = context_schema_data["_metadata"]
 
-    try:
-        schema_record = ConfigContextSchema.objects.get(
-            name=schema_metadata["name"],
-            owner_content_type=git_repository_content_type,
-            owner_object_id=repository_record.pk,
-        )
-    except ConfigContextSchema.DoesNotExist:
-        schema_record = ConfigContextSchema(
-            name=schema_metadata["name"],
-            owner_content_type=git_repository_content_type,
-            owner_object_id=repository_record.pk,
-            data_schema=context_schema_data["data_schema"],
-        )
-        created = True
+    schema_record, created = ConfigContextSchema.objects.get_or_create(
+        name=schema_metadata["name"],
+        owner_content_type=git_repository_content_type,
+        owner_object_id=repository_record.pk,
+        defaults={"data_schema": context_schema_data["data_schema"]},
+    )
 
     if schema_record.description != schema_metadata.get("description", ""):
         schema_record.description = schema_metadata.get("description", "")
@@ -868,22 +859,12 @@ def update_git_export_templates(repository_record, job_result):
             # To reduce noise until the base issue is fixed, we need to explicitly detect object changes:
             created = False
             modified = False
-            try:
-                template_record = ExportTemplate.objects.get(
-                    content_type=model_content_type,
-                    name=file_name,
-                    owner_content_type=git_repository_content_type,
-                    owner_object_id=repository_record.pk,
-                )
-            except ExportTemplate.DoesNotExist:
-                template_record = ExportTemplate(
-                    content_type=model_content_type,
-                    name=file_name,
-                    owner_content_type=git_repository_content_type,
-                    owner_object_id=repository_record.pk,
-                )
-                created = True
-                modified = True
+            template_record, created = ExportTemplate.objects.get_or_create(
+                content_type=model_content_type,
+                name=file_name,
+                owner_content_type=git_repository_content_type,
+                owner_object_id=repository_record.pk,
+            )
 
             if template_record.template_code != template_content:
                 template_record.template_code = template_content

nautobot/extras/datasources/registry.py

@@ -32,7 +32,7 @@ def refresh_datasource_content(model_name, record, user, job_result, delete=Fals
         job_result (JobResult): Passed through to the callback functions to use with logging their actions.
         delete (bool): True if the record is being deleted; False if it is being created/updated.
     """
-    job_result.log(f"Refreshing data provided by {record}...", level_choice=LogLevelChoices.LOG_INFO)
+    job_result.log(f"Refreshing data provided by {record}...", level_choice=LogLevelChoices.LOG_INFO, obj=record)
 
     for entry in get_datasource_contents(model_name):
         job_result.log(f"Refreshing {entry.name}...", level_choice=LogLevelChoices.LOG_INFO)
@@ -54,4 +54,4 @@ def refresh_datasource_content(model_name, record, user, job_result, delete=Fals
         raise RuntimeError(msg)
 
     # Otherwise, log a friendly info message.
-    job_result.log(f"Data refresh from {record} complete!", level_choice=LogLevelChoices.LOG_INFO)
+    job_result.log(f"Data refresh from {record} complete!", level_choice=LogLevelChoices.LOG_INFO, obj=record)

nautobot/extras/jobs.py

@@ -1144,20 +1144,23 @@ def run_job(self, job_class_path, *args, **kwargs):
         raise
 
 
-def enqueue_job_hooks(object_change):
+def enqueue_job_hooks(object_change, may_reload_jobs=True):
     """
-    Find job hook(s) assigned to this changed object type + action and enqueue them
-    to be processed
+    Find job hook(s) assigned to this changed object type + action and enqueue them to be processed.
+
+    Returns:
+        jobs_reloaded (bool): whether Jobs were reloaded to make this happen
     """
+    jobs_reloaded = False
 
     # Job hooks cannot trigger other job hooks
     if object_change.change_context == ObjectChangeEventContextChoices.CONTEXT_JOB_HOOK:
-        return
+        return jobs_reloaded
 
     # Determine whether this type of object supports job hooks
     content_type = object_change.changed_object_type
     if content_type not in change_logged_models_queryset():
-        return
+        return jobs_reloaded
 
     # Retrieve any applicable job hooks
     action_flag = {
@@ -1167,7 +1170,14 @@ def enqueue_job_hooks(object_change):
     }[object_change.action]
     job_hooks = JobHook.objects.filter(content_types=content_type, enabled=True, **{action_flag: True})
 
+    if not job_hooks.exists():
+        return jobs_reloaded
+
     # Enqueue the jobs related to the job_hooks
+    if may_reload_jobs:
+        get_jobs(reload=True)
+        jobs_reloaded = True
+
     for job_hook in job_hooks:
         job_model = job_hook.job
         if not job_model.installed or not job_model.enabled:
@@ -1178,3 +1188,5 @@ def enqueue_job_hooks(object_change):
             logger.error("JobHook %s is enabled, but the underlying Job implementation is missing", job_hook)
         else:
             JobResult.enqueue_job(job_model, object_change.user, object_change=object_change.pk)
+
+    return jobs_reloaded

nautobot/extras/models/datasources.py

@@ -115,6 +115,12 @@ class GitRepository(PrimaryModel):
                     "provides contents overlapping with this repository."
                 )
 
+        # Changing branch or remote_url invalidates current_head
+        if self.present_in_database:
+            past = GitRepository.objects.get(id=self.id)
+            if self.remote_url != past.remote_url or self.branch != past.branch:
+                self.current_head = ""
+
     def get_latest_sync(self):
         """
         Return a `JobResult` for the latest sync operation.