Merge pull request #205 from nautobot/u/whitej6-issue-203

update class path for job URL
nautobot · Jan 8, 2024 · 28ed409 · 28ed409
2 parents 7c1e216 + 0656a74
commit 28ed409
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -230,7 +230,9 @@ jobs:
       - name: "Run Tests"
         run: "poetry run invoke unittest"
   changelog:
-    if: contains(fromJson('["develop","ltm-1.6"]'), github.base_ref)
+    if: |
+      contains(fromJson('["develop","ltm-1.6"]'), github.base_ref) &&
+      (github.head_ref != 'main')
     runs-on: "ubuntu-22.04"
     steps:
       - name: "Check out repository code"

diff --git a/changes/203.fixed b/changes/203.fixed
@@ -0,0 +1 @@
+Fixed old reference to class path in URL pattern for job.
diff --git a/nautobot_firewall_models/jobs.py b/nautobot_firewall_models/jobs.py
@@ -23,6 +23,7 @@ class Meta:
         name = "Generate FW Config via Capirca."
         description = "Generate FW Config via Capirca and update the models."
         commit_default = True
+        has_sensitive_variables = False
 
     def run(self, device):  # pylint: disable=arguments-differ
         """Run a job to remove legacy reservations."""
@@ -48,7 +49,7 @@ def run(self, device):  # pylint: disable=arguments-differ
             device_obj = Device.objects.get(pk=dev)
             logger.debug("Running against Device: `%s`", str(device_obj))
             CapircaPolicy.objects.update_or_create(device=device_obj)
-            logger.info(obj=device_obj, message=f"{device_obj} Updated")
+            logger.info(f"{device_obj} Updated", extra={"object": device_obj})
 
 
 jobs = [RunCapircaJob]

diff --git a/nautobot_firewall_models/templates/nautobot_firewall_models/inc/capirca_policy.html b/nautobot_firewall_models/templates/nautobot_firewall_models/inc/capirca_policy.html
@@ -2,6 +2,6 @@
     <div class="panel-heading">
         <strong>Capirca Firewall Configurations</strong> - 
         <a href="{% url 'plugins:nautobot_firewall_models:capircapolicy_devicedetail' pk=object.pk %}"><i class="mdi mdi-file-document-outline"></i></a>
-        <a href="{% url 'extras:job' class_path='plugins-nautobot_firewall_models-jobs-runcapircajob/run' %}?device={{ object.pk }}"><i class="mdi mdi-play-circle" title="Execute Capirca Jobs"></i></a>
+        <a href="{% url 'extras:job_run_by_class_path' class_path='nautobot_firewall_models.jobs.RunCapircaJob' %}?device={{ object.pk }}"><i class="mdi mdi-play-circle" title="Execute Capirca Jobs"></i></a>
     </div>
 </div>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fixed old reference to class path in URL pattern for job.