config_compliance -> compliance

amyasnikov · Dec 26, 2023 · 08f5815 · 08f5815
1 parent 7266ebc
commit 08f5815
Show file tree

Hide file tree

Showing 22 changed files with 14 additions and 19 deletions.
diff --git a/validity/api/views.py b/validity/api/views.py
@@ -8,7 +8,7 @@
 
 from validity import config, filtersets, models
 from validity.choices import SeverityChoices
-from validity.config_compliance.exceptions import DeviceConfigError
+from validity.compliance.exceptions import DeviceConfigError
 from . import serializers
 
 

diff --git a/...nfig_compliance/device_config/__init__.py → ...dity/compliance/device_config/__init__.py b/...nfig_compliance/device_config/__init__.py → ...dity/compliance/device_config/__init__.py
diff --git a/...y/config_compliance/device_config/base.py → validity/compliance/device_config/base.py b/...y/config_compliance/device_config/base.py → validity/compliance/device_config/base.py
diff --git a/...nfig_compliance/device_config/routeros.py → ...dity/compliance/device_config/routeros.py b/...nfig_compliance/device_config/routeros.py → ...dity/compliance/device_config/routeros.py
diff --git a/...ty/config_compliance/device_config/ttp.py → validity/compliance/device_config/ttp.py b/...ty/config_compliance/device_config/ttp.py → validity/compliance/device_config/ttp.py
diff --git a/...y/config_compliance/device_config/yaml.py → validity/compliance/device_config/yaml.py b/...y/config_compliance/device_config/yaml.py → validity/compliance/device_config/yaml.py
diff --git a/validity/config_compliance/dynamic_pairs.py → validity/compliance/dynamic_pairs.py b/validity/config_compliance/dynamic_pairs.py → validity/compliance/dynamic_pairs.py
diff --git a/validity/config_compliance/eval/__init__.py → validity/compliance/eval/__init__.py b/validity/config_compliance/eval/__init__.py → validity/compliance/eval/__init__.py
diff --git a/...config_compliance/eval/default_nameset.py → validity/compliance/eval/default_nameset.py b/...config_compliance/eval/default_nameset.py → validity/compliance/eval/default_nameset.py
diff --git a/validity/config_compliance/eval/eval.py → validity/compliance/eval/eval.py b/validity/config_compliance/eval/eval.py → validity/compliance/eval/eval.py
diff --git a/...y/config_compliance/eval/eval_defaults.py → validity/compliance/eval/eval_defaults.py b/...y/config_compliance/eval/eval_defaults.py → validity/compliance/eval/eval_defaults.py
diff --git a/validity/config_compliance/exceptions.py → validity/compliance/exceptions.py b/validity/config_compliance/exceptions.py → validity/compliance/exceptions.py
diff --git a/validity/models/device.py b/validity/models/device.py
@@ -3,7 +3,7 @@
 
 from dcim.models import Device
 
-from validity.config_compliance.device_config import DeviceConfig
+from validity.compliance.device_config import DeviceConfig
 from validity.j2_env import Environment
 from validity.managers import VDeviceQS
 from .data import VDataFile, VDataSource

diff --git a/validity/models/selector.py b/validity/models/selector.py
@@ -12,7 +12,7 @@
 from tenancy.models import Tenant
 
 from validity.choices import BoolOperationChoices, DynamicPairsChoices
-from validity.config_compliance.dynamic_pairs import DynamicPairNameFilter, dpf_factory
+from validity.compliance.dynamic_pairs import DynamicPairNameFilter, dpf_factory
 from validity.utils.misc import reraise
 from .base import BaseModel
 from .device import VDevice

diff --git a/validity/scripts/run_tests.py b/validity/scripts/run_tests.py
@@ -15,9 +15,9 @@
 from simpleeval import InvalidExpression
 
 import validity
-import validity.config_compliance.eval.default_nameset as default_nameset
-from validity.config_compliance.eval import ExplanationalEval
-from validity.config_compliance.exceptions import DeviceConfigError, EvalError
+import validity.compliance.eval.default_nameset as default_nameset
+from validity.compliance.eval import ExplanationalEval
+from validity.compliance.exceptions import DeviceConfigError, EvalError
 from validity.models import (
     ComplianceReport,
     ComplianceSelector,

diff --git a/validity/tests/test_api.py b/validity/tests/test_api.py
@@ -24,7 +24,7 @@
     TenantFactory,
 )
 
-from validity.config_compliance.device_config import DeviceConfig
+from validity.compliance.device_config import DeviceConfig
 
 
 class TestDBNameSet(ApiPostGetTest):

diff --git a/...t_config_compliance/test_device_config.py → ...sts/test_compliance/test_device_config.py b/...t_config_compliance/test_device_config.py → ...sts/test_compliance/test_device_config.py
@@ -5,7 +5,7 @@
 import yaml
 from factories import DataFileFactory, DeviceFactory
 
-from validity.config_compliance.device_config import DeviceConfig
+from validity.compliance.device_config import DeviceConfig
 from validity.models.data import VDataFile
 
 

diff --git a/...t_config_compliance/test_dynamic_pairs.py → ...sts/test_compliance/test_dynamic_pairs.py b/...t_config_compliance/test_dynamic_pairs.py → ...sts/test_compliance/test_dynamic_pairs.py
@@ -5,12 +5,7 @@
 from extras.models import Tag
 from factories import DeviceFactory, SelectorFactory, TagFactory
 
-from validity.config_compliance.dynamic_pairs import (
-    DynamicPairNameFilter,
-    DynamicPairTagFilter,
-    NoneFilter,
-    dpf_factory,
-)
+from validity.compliance.dynamic_pairs import DynamicPairNameFilter, DynamicPairTagFilter, NoneFilter, dpf_factory
 
 
 @pytest.mark.parametrize(

diff --git a/...tests/test_config_compliance/test_eval.py → validity/tests/test_compliance/test_eval.py b/...tests/test_config_compliance/test_eval.py → validity/tests/test_compliance/test_eval.py
@@ -7,8 +7,8 @@
 from deepdiff.serialization import json_dumps
 from simpleeval import InvalidExpression
 
-from validity.config_compliance.eval import ExplanationalEval, default_nameset, eval_defaults
-from validity.config_compliance.exceptions import EvalError
+from validity.compliance.eval import ExplanationalEval, default_nameset, eval_defaults
+from validity.compliance.exceptions import EvalError
 
 
 EXPR_1 = '{"param_1": "val_1", "param_2": "val_2"} == {"param_1": "val_1"}'

diff --git a/validity/tests/test_scripts/test_run_tests.py b/validity/tests/test_scripts/test_run_tests.py
@@ -7,7 +7,7 @@
 from factories import CompTestDBFactory, DeviceFactory, NameSetDBFactory, ReportFactory, SelectorFactory
 from simpleeval import InvalidExpression
 
-from validity.config_compliance.exceptions import EvalError
+from validity.compliance.exceptions import EvalError
 from validity.models import ComplianceReport, ComplianceTestResult, VDevice
 from validity.scripts import run_tests
 from validity.scripts.run_tests import RunTestsScript as RunTestsMixin

diff --git a/validity/views/device.py b/validity/views/device.py
@@ -4,7 +4,7 @@
 from netbox.views import generic
 from utilities.views import ViewTab, register_model_view
 
-from validity.config_compliance.exceptions import DeviceConfigError
+from validity.compliance.exceptions import DeviceConfigError
 from validity.models import VDevice
 from .base import TestResultBaseView
 

diff --git a/validity/views/test_result.py b/validity/views/test_result.py
@@ -5,7 +5,7 @@
 from utilities.views import register_model_view
 
 from validity import filtersets, forms, models, tables
-from validity.config_compliance.eval import repr_
+from validity.compliance.eval import repr_
 
 
 class ComplianceResultListView(generic.ObjectListView):