From c30d22335a5255546ac4f6fe1725a25db8e72709 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Thu, 21 Mar 2024 13:19:12 -0400
Subject: [PATCH] Move extras.jinja2.ConfigTemplateLoader to
 utilities.jinja2.DataFileLoader

---
 netbox/extras/models/configs.py        | 4 ++--
 netbox/{extras => utilities}/jinja2.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename netbox/{extras => utilities}/jinja2.py (94%)

diff --git a/netbox/extras/models/configs.py b/netbox/extras/models/configs.py
index 7d7ac1db1..d0ce42b8b 100644
--- a/netbox/extras/models/configs.py
+++ b/netbox/extras/models/configs.py
@@ -7,12 +7,12 @@ from django.utils.translation import gettext_lazy as _
 from jinja2.loaders import BaseLoader
 from jinja2.sandbox import SandboxedEnvironment
 
-from extras.jinja2 import ConfigTemplateLoader
 from extras.querysets import ConfigContextQuerySet
 from netbox.config import get_config
 from netbox.registry import registry
 from netbox.models import ChangeLoggedModel
 from netbox.models.features import CloningMixin, CustomLinksMixin, ExportTemplatesMixin, SyncedDataMixin, TagsMixin
+from utilities.jinja2 import DataFileLoader
 from utilities.utils import deepmerge
 
 __all__ = (
@@ -290,7 +290,7 @@ class ConfigTemplate(SyncedDataMixin, CustomLinksMixin, ExportTemplatesMixin, Ta
         """
         # Initialize the template loader & cache the base template code (if applicable)
         if self.data_file:
-            loader = ConfigTemplateLoader(data_source=self.data_source)
+            loader = DataFileLoader(data_source=self.data_source)
             loader.cache_templates({
                 self.data_file.path: self.template_code
             })
diff --git a/netbox/extras/jinja2.py b/netbox/utilities/jinja2.py
similarity index 94%
rename from netbox/extras/jinja2.py
rename to netbox/utilities/jinja2.py
index 7e5bcca14..10d56a0f0 100644
--- a/netbox/extras/jinja2.py
+++ b/netbox/utilities/jinja2.py
@@ -3,11 +3,11 @@ from jinja2 import BaseLoader, TemplateNotFound
 from jinja2.meta import find_referenced_templates
 
 __all__ = (
-    'ConfigTemplateLoader',
+    'DataFileLoader',
 )
 
 
-class ConfigTemplateLoader(BaseLoader):
+class DataFileLoader(BaseLoader):
     """
     Custom Jinja2 loader to facilitate populating template content from DataFiles.
     """