Make configuration_validation_model a class variable

MatterMiners · Sep 27, 2022 · 65ad254 · 65ad254
1 parent 2150fd4
commit 65ad254
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 10 deletions.
diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
@@ -1,12 +1,12 @@
-.. Created by changelog.py at 2022-09-16, command
+.. Created by changelog.py at 2022-09-24, command
    '/Users/giffler/.cache/pre-commit/repor6pnmwlm/py_env-python3.10/bin/changelog docs/source/changes compile --output=docs/source/changelog.rst'
    based on the format of 'https://keepachangelog.com/'
 
 #########
 CHANGELOG
 #########
 
-[Unreleased] - 2022-09-16
+[Unreleased] - 2022-09-24
 =========================
 
 Added

diff --git a/tardis/adapters/sites/cloudstack.py b/tardis/adapters/sites/cloudstack.py
@@ -36,10 +36,11 @@ class CloudStackAdapterConfigurationModel(SiteAdapterBaseModel):
 
 
 class CloudStackAdapter(SiteAdapter):
+    _configuration_validation_model = CloudStackAdapterConfigurationModel
+
     def __init__(self, machine_type: str, site_name: str):
         self._machine_type = machine_type
         self._site_name = site_name
-        self._configuration_validation_model = CloudStackAdapterConfigurationModel
 
         self.cloud_stack_client = CloudStack(
             end_point=self.configuration.end_point,

diff --git a/tardis/adapters/sites/fakesite.py b/tardis/adapters/sites/fakesite.py
@@ -23,10 +23,11 @@ class FakeSiteAdapterConfigurationModel(SiteAdapterBaseModel):
 
 
 class FakeSiteAdapter(SiteAdapter):
+    _configuration_validation_model = FakeSiteAdapterConfigurationModel
+
     def __init__(self, machine_type: str, site_name: str) -> None:
         self._machine_type = machine_type
         self._site_name = site_name
-        self._configuration_validation_model = FakeSiteAdapterConfigurationModel
         self._api_response_delay = self.configuration.api_response_delay
         self._resource_boot_time = self.configuration.resource_boot_time
 

diff --git a/tardis/adapters/sites/htcondor.py b/tardis/adapters/sites/htcondor.py
@@ -197,6 +197,7 @@ class HTCondorAdapter(SiteAdapter):
     htcondor_machine_meta_data_translation_mapping = AttributeDict(
         Cores=1, Memory=1024, Disk=1024 * 1024
     )
+    _configuration_validation_model = HTCondorAdapterConfigurationModel
 
     def __init__(
         self,
@@ -205,7 +206,6 @@ def __init__(
     ):
         self._machine_type = machine_type
         self._site_name = site_name
-        self._configuration_validation_model = HTCondorAdapterConfigurationModel
         self._executor = self.configuration.executor
         bulk_size = self.configuration.bulk_size
         bulk_delay = self.configuration.bulk_delay

diff --git a/tardis/adapters/sites/kubernetes.py b/tardis/adapters/sites/kubernetes.py
@@ -79,10 +79,11 @@ def validate_machine_type_configuration(
 
 
 class KubernetesAdapter(SiteAdapter):
+    _configuration_validation_model = KubernetesAdapterConfigurationModel
+
     def __init__(self, machine_type: str, site_name: str):
         self._machine_type = machine_type
         self._site_name = site_name
-        self._configuration_validation_model = KubernetesAdapterConfigurationModel
         key_translator = StaticMapping(
             remote_resource_uuid="uid", drone_uuid="name", resource_status="type"
         )

diff --git a/tardis/adapters/sites/moab.py b/tardis/adapters/sites/moab.py
@@ -61,10 +61,11 @@ class MoabAdapterConfigurationModel(SiteAdapterBaseModel):
 
 
 class MoabAdapter(SiteAdapter):
+    _configuration_validation_model = MoabAdapterConfigurationModel
+
     def __init__(self, machine_type: str, site_name: str):
         self._machine_type = machine_type
         self._site_name = site_name
-        self._configuration_validation_model = MoabAdapterConfigurationModel
 
         try:
             self._startup_command = self.machine_type_configuration.StartupCommand

diff --git a/tardis/adapters/sites/openstack.py b/tardis/adapters/sites/openstack.py
@@ -88,10 +88,11 @@ def check_option_group_exclusivity(option_group1, option_group2):
 
 
 class OpenStackAdapter(SiteAdapter):
+    _configuration_validation_model = OpenStackAdapterConfigurationModel
+
     def __init__(self, machine_type: str, site_name: str):
         self._machine_type = machine_type
         self._site_name = site_name
-        self._configuration_validation_model = OpenStackAdapterConfigurationModel
 
         auth = AuthPassword(
             auth_url=self.configuration.auth_url,

diff --git a/tardis/adapters/sites/slurm.py b/tardis/adapters/sites/slurm.py
@@ -59,10 +59,11 @@ class SlurmAdapterConfigurationModel(SiteAdapterBaseModel):
 
 
 class SlurmAdapter(SiteAdapter):
+    _configuration_validation_model = SlurmAdapterConfigurationModel
+
     def __init__(self, machine_type: str, site_name: str):
         self._machine_type = machine_type
         self._site_name = site_name
-        self._configuration_validation_model = SlurmAdapterConfigurationModel
 
         try:
             self._startup_command = self.machine_type_configuration.StartupCommand

diff --git a/tardis/interfaces/siteadapter.py b/tardis/interfaces/siteadapter.py
@@ -151,7 +151,7 @@ def configuration_validation_model(self) -> Callable:
             return self._configuration_validation_model
         except AttributeError as ae:
             raise AttributeError(
-                f"Class {self.__class__.__name__} must have an '_configuration_validation_model' instance variable"  # noqa
+                f"Class {self.__class__.__name__} must have an '_configuration_validation_model' class variable"  # noqa
             ) from ae
 
     @abstractmethod