Closes #668 - Removed unneeded lookup for GoldenConfigSetting (#685)

* Closes #668 - Removed unneeded lookup for GoldenConfigSetting * Fix flake8 --------- Co-authored-by: Jeremy White <[email protected]>
nautobot · Dec 13, 2023 · cc647ca · cc647ca
1 parent f8d106a
commit cc647ca
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,6 +8,7 @@ on: # yamllint disable-line rule:truthy rule:comments
     branches:
       - "main"
       - "develop"
+      - "ltm-1.6"
     tags:
       - "v*"
   pull_request: ~

diff --git a/docs/admin/release_notes/version_1.6.md b/docs/admin/release_notes/version_1.6.md
@@ -5,6 +5,12 @@
 - Add functionality to compliance result to provide a Remediation plan.
 - Supports Nautobot >=1.6.1,<2.0.0.
 
+## v1.6.3 - 2023-10
+
+### Fixed
+
+- [#668](https://github.com/nautobot/nautobot-plugin-golden-config/issue/668) - Removed unneeded lookup for GoldenConfigSetting
+
 ## v1.6.2 - 2023-09
 
 ### Fixed

diff --git a/nautobot_golden_config/template_content.py b/nautobot_golden_config/template_content.py
@@ -2,11 +2,9 @@
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import Count, Q
 from django.urls import reverse
-from nautobot.dcim.models import Device
 from nautobot.extras.plugins import PluginTemplateExtension
 from nautobot_golden_config.models import ConfigCompliance, GoldenConfig
 from nautobot_golden_config.utilities.constant import CONFIG_FEATURES, ENABLE_COMPLIANCE
-from nautobot_golden_config.utilities.helper import get_device_to_settings_map
 
 
 class ConfigComplianceDeviceCheck(PluginTemplateExtension):  # pylint: disable=abstract-method
@@ -21,6 +19,8 @@ def get_device(self):
     def right_page(self):
         """Content to add to the configuration compliance."""
         comp_obj = ConfigCompliance.objects.filter(device=self.get_device()).values("rule__feature__name", "compliance")
+        if not comp_obj:
+            return ""
         extra_context = {
             "compliance": comp_obj,
             "device": self.get_device(),
@@ -72,6 +72,8 @@ def right_page(self):
             .order_by("rule__feature__name")
             .values("rule__feature__name", "compliant", "non_compliant")
         )
+        if not comp_obj:
+            return ""
         extra_context = {"compliance": comp_obj, "template_type": "location"}
         return self.render(
             "nautobot_golden_config/content_template.html",
@@ -92,13 +94,13 @@ def right_page(self):
         """Content to add to the configuration compliance."""
         device = self.get_device()
         golden_config = GoldenConfig.objects.filter(device=device).first()
-        settings = get_device_to_settings_map(queryset=Device.objects.filter(id=device.id))
+        if not golden_config:
+            return ""
         extra_context = {
             "device": self.get_device(),  # device,
             "golden_config": golden_config,
             "template_type": "device-configs",
             "config_features": CONFIG_FEATURES,
-            "matched_config_setting": settings.get(device.id, False),
         }
         return self.render(
             "nautobot_golden_config/content_template.html",
@@ -128,6 +130,8 @@ def right_page(self):
             .order_by("rule__feature__name")
             .values("rule__feature__name", "compliant", "non_compliant")
         )
+        if not comp_obj:
+            return ""
         extra_context = {"compliance": comp_obj, "template_type": "location"}
         return self.render(
             "nautobot_golden_config/content_template.html",

diff --git a/nautobot_golden_config/templates/nautobot_golden_config/content_template.html b/nautobot_golden_config/templates/nautobot_golden_config/content_template.html
@@ -64,7 +64,6 @@
           <th>Config</th>
         </tr>
       </thead>
-      {% if matched_config_setting %}
       <tbody>
         {% if config_features.compliance and golden_config.compliance_config %}
         <tr>
@@ -118,7 +117,6 @@
         </tr>
         {% endif %}
       </tbody>
-      {% endif %}
     </table>
   </div>
   {% endif %}