Update code to remove use of deprecated PluginCustomValidator class.

changes/181.fixed

@@ -0,0 +1 @@
+Replaced all occurrences of PluginCustomValidator with CustomValidator.

nautobot_data_validation_engine/custom_validators.py

@@ -1,7 +1,7 @@
 """
 This is the meat of this app.
 
-Here we dynamically generate a PluginCustomValidator class
+Here we dynamically generate a CustomValidator class
 for each model currently registered in the extras_features
 query registry 'custom_validators'.
 
@@ -23,7 +23,7 @@
 from nautobot.core.utils.data import render_jinja2
 from nautobot.extras.datasources import ensure_git_repository
 from nautobot.extras.models import GitRepository
-from nautobot.extras.plugins import CustomValidator, PluginCustomValidator
+from nautobot.extras.plugins import CustomValidator
 from nautobot.extras.registry import registry
 
 from nautobot_data_validation_engine.models import (
@@ -38,8 +38,8 @@
 LOGGER = logging.getLogger(__name__)
 
 
-class BaseValidator(PluginCustomValidator):
-    """Base PluginCustomValidator class that implements the core logic for enforcing validation rules defined in this app."""
+class BaseValidator(CustomValidator):
+    """Base CustomValidator class that implements the core logic for enforcing validation rules defined in this app."""
 
     model = None
 
@@ -304,10 +304,10 @@ def compliance_result(self, message, attribute=None, valid=True):
 
 
 class CustomValidatorIterator:
-    """Iterator that generates PluginCustomValidator classes for each model registered in the extras feature query registry 'custom_validators'."""
+    """Iterator that generates CustomValidator classes for each model registered in the extras feature query registry 'custom_validators'."""
 
     def __iter__(self):
-        """Return a generator of PluginCustomValidator classes for each registered model."""
+        """Return a generator of CustomValidator classes for each registered model."""
         for app_label, models in registry["model_features"]["custom_validators"].items():
             for model in models:
                 yield type(

nautobot_data_validation_engine/jobs.py

@@ -78,7 +78,7 @@ def run(self, *args, **kwargs):
         for compliance_class in compliance_classes:
             if selected_data_compliance_rules and compliance_class.__name__ not in selected_data_compliance_rules:
                 continue
-            logger.info(f"Running {compliance_class.__name__}")
+            logger.info("Running %s", compliance_class.__name__)
             app_label, model = compliance_class.model.split(".")
             for obj in global_apps.get_model(app_label, model).objects.all():
                 ins = compliance_class(obj)

nautobot_data_validation_engine/template_content.py

@@ -28,10 +28,10 @@ def detail_tabs(self):
 
 
 class ComplianceTemplateIterator:
-    """Iterator that generates PluginCustomValidator classes for each model registered in the extras feature query registry 'custom_validators'."""
+    """Iterator that generates CustomValidator classes for each model registered in the extras feature query registry 'custom_validators'."""
 
     def __iter__(self):
-        """Return a generator of PluginCustomValidator classes for each registered model."""
+        """Return a generator of CustomValidator classes for each registered model."""
         for app_label, models in registry["model_features"]["custom_validators"].items():
             for model in models:
                 label = f"{app_label}.{model}"