refactor: remove barel files

scripts/playbooks.py

@@ -20,7 +20,7 @@
 import click
 import networkx as nx
 
-from tdp.cli.params import collections_option
+from tdp.cli.params.collections_option import collections_option
 from tdp.core.constants import DEFAULT_SERVICE_PRIORITY, SERVICE_PRIORITY
 from tdp.core.dag import Dag
 from tdp.core.entities.operation import OperationName

tdp/cli/commands/browse.py

@@ -8,7 +8,7 @@
 from sqlalchemy import Engine
 from tabulate import tabulate
 
-from tdp.cli.params import database_dsn_option
+from tdp.cli.params.database_dsn_option import database_dsn_option
 from tdp.cli.utils import (
     print_deployment,
     print_operations,

tdp/cli/commands/dag.py

@@ -11,11 +11,11 @@
 import click
 import networkx as nx
 
-from tdp.cli.params import collections_option
+from tdp.cli.params.collections_option import collections_option
 from tdp.core.dag import Dag
 
 if TYPE_CHECKING:
-    from tdp.core.collections import Collections
+    from tdp.core.collections.collections import Collections
 
 
 @click.command()

tdp/cli/commands/default_diff.py

@@ -12,12 +12,14 @@
 import click
 from ansible.utils.vars import merge_hash
 
-from tdp.cli.params import collections_option, vars_option
+from tdp.cli.params.collections_option import collections_option
+from tdp.cli.params.vars_option import vars_option
 from tdp.core.constants import DEFAULT_VARS_DIRECTORY_NAME
-from tdp.core.variables import ClusterVariables, Variables
+from tdp.core.variables.cluster_variables import ClusterVariables
+from tdp.core.variables.variables import Variables
 
 if TYPE_CHECKING:
-    from tdp.core.collections import Collections
+    from tdp.core.collections.collections import Collections
 
 
 @click.command()

tdp/cli/commands/deploy.py

@@ -9,20 +9,19 @@
 import click
 from sqlalchemy import Engine
 
-from tdp.cli.params import (
-    collections_option,
-    database_dsn_option,
-    validate_option,
-    vars_option,
-)
+from tdp.cli.params.collections_option import collections_option
+from tdp.cli.params.database_dsn_option import database_dsn_option
+from tdp.cli.params.validate_option import validate_option
+from tdp.cli.params.vars_option import vars_option
 from tdp.cli.utils import check_services_cleanliness
-from tdp.core.deployment import DeploymentRunner, Executor
+from tdp.core.deployment.deployment_runner import DeploymentRunner
+from tdp.core.deployment.executor import Executor
 from tdp.core.models.enums import DeploymentStateEnum
-from tdp.core.variables import ClusterVariables
+from tdp.core.variables.cluster_variables import ClusterVariables
 from tdp.dao import Dao
 
 if TYPE_CHECKING:
-    from tdp.core.collections import Collections
+    from tdp.core.collections.collections import Collections
 
 
 @click.command()

tdp/cli/commands/init.py

@@ -9,17 +9,15 @@
 import click
 from sqlalchemy import Engine
 
-from tdp.cli.params import (
-    collections_option,
-    database_dsn_option,
-    validate_option,
-    vars_option,
-)
-from tdp.core.models import init_database
-from tdp.core.variables import ClusterVariables
+from tdp.cli.params.collections_option import collections_option
+from tdp.cli.params.database_dsn_option import database_dsn_option
+from tdp.cli.params.validate_option import validate_option
+from tdp.cli.params.vars_option import vars_option
+from tdp.core.models.base_model import init_database
+from tdp.core.variables.cluster_variables import ClusterVariables
 
 if TYPE_CHECKING:
-    from tdp.core.collections import Collections
+    from tdp.core.collections.collections import Collections
 
 
 @click.command()

tdp/cli/commands/ops.py

@@ -9,12 +9,13 @@
 import click
 from tabulate import tabulate
 
-from tdp.cli.params import collections_option, hosts_option
+from tdp.cli.params.collections_option import collections_option
+from tdp.cli.params.hosts_option import hosts_option
 from tdp.core.dag import Dag
 from tdp.core.entities.operation import Operation, PlaybookOperation
 
 if TYPE_CHECKING:
-    from tdp.core.collections import Collections
+    from tdp.core.collections.collections import Collections
 
 
 @click.command()

tdp/cli/commands/plan/__init__.py

@@ -3,12 +3,12 @@
 
 import click
 
-from tdp.cli.commands.plan.dag import dag
-from tdp.cli.commands.plan.edit import edit
-from tdp.cli.commands.plan.import_file import import_file
-from tdp.cli.commands.plan.ops import ops
-from tdp.cli.commands.plan.reconfigure import reconfigure
-from tdp.cli.commands.plan.resume import resume
+from .dag import dag
+from .edit import edit
+from .import_file import import_file
+from .ops import ops
+from .reconfigure import reconfigure
+from .resume import resume
 
 
 @click.group()

tdp/cli/commands/plan/dag.py

@@ -8,16 +8,19 @@
 import click
 from sqlalchemy import Engine
 
-from tdp.cli.params import collections_option, database_dsn_option
-from tdp.cli.params.plan import force_option, preview_option, rolling_interval_option
+from tdp.cli.params.collections_option import collections_option
+from tdp.cli.params.database_dsn_option import database_dsn_option
+from tdp.cli.params.plan.force_option import force_option
+from tdp.cli.params.plan.preview_option import preview_option
+from tdp.cli.params.plan.rolling_interval_option import rolling_interval_option
 from tdp.cli.utils import print_deployment
 from tdp.core.dag import Dag
-from tdp.core.models import DeploymentModel
+from tdp.core.models.deployment_model import DeploymentModel
 from tdp.core.models.enums import FilterTypeEnum
 from tdp.dao import Dao
 
 if TYPE_CHECKING:
-    from tdp.core.collections import Collections
+    from tdp.core.collections.collections import Collections
 
 
 def _validate_filtertype(

tdp/cli/commands/plan/edit.py

@@ -12,13 +12,14 @@
 import click
 from sqlalchemy import Engine
 
-from tdp.cli.params import collections_option, database_dsn_option
+from tdp.cli.params.collections_option import collections_option
+from tdp.cli.params.database_dsn_option import database_dsn_option
 from tdp.cli.utils import parse_file
 from tdp.core.models.deployment_model import DeploymentModel
 from tdp.dao import Dao
 
 if TYPE_CHECKING:
-    from tdp.core.collections import Collections
+    from tdp.core.collections.collections import Collections
 
 logger = logging.getLogger(__name__)
 

tdp/cli/commands/plan/import_file.py

@@ -9,14 +9,15 @@
 import click
 from sqlalchemy import Engine
 
-from tdp.cli.params import collections_option, database_dsn_option
-from tdp.cli.params.plan import force_option
+from tdp.cli.params.collections_option import collections_option
+from tdp.cli.params.database_dsn_option import database_dsn_option
+from tdp.cli.params.plan.force_option import force_option
 from tdp.cli.utils import parse_file
 from tdp.core.models.deployment_model import DeploymentModel
 from tdp.dao import Dao
 
 if TYPE_CHECKING:
-    from tdp.core.collections import Collections
+    from tdp.core.collections.collections import Collections
 
 logger = logging.getLogger(__name__)
 

tdp/cli/commands/plan/ops.py

@@ -8,16 +8,18 @@
 import click
 from sqlalchemy import Engine
 
-from tdp.cli.params import collections_option, database_dsn_option, hosts_option
-from tdp.cli.params.plan import force_option, preview_option, rolling_interval_option
-from tdp.cli.utils import (
-    print_deployment,
-)
-from tdp.core.models import DeploymentModel
+from tdp.cli.params.collections_option import collections_option
+from tdp.cli.params.database_dsn_option import database_dsn_option
+from tdp.cli.params.hosts_option import hosts_option
+from tdp.cli.params.plan.force_option import force_option
+from tdp.cli.params.plan.preview_option import preview_option
+from tdp.cli.params.plan.rolling_interval_option import rolling_interval_option
+from tdp.cli.utils import print_deployment
+from tdp.core.models.deployment_model import DeploymentModel
 from tdp.dao import Dao
 
 if TYPE_CHECKING:
-    from tdp.core.collections import Collections
+    from tdp.core.collections.collections import Collections
 
 
 @click.command()

tdp/cli/commands/plan/reconfigure.py

@@ -8,16 +8,17 @@
 import click
 from sqlalchemy import Engine
 
-from tdp.cli.params import collections_option, database_dsn_option
-from tdp.cli.params.plan import force_option, preview_option, rolling_interval_option
-from tdp.cli.utils import (
-    print_deployment,
-)
-from tdp.core.models import DeploymentModel
+from tdp.cli.params.collections_option import collections_option
+from tdp.cli.params.database_dsn_option import database_dsn_option
+from tdp.cli.params.plan.force_option import force_option
+from tdp.cli.params.plan.preview_option import preview_option
+from tdp.cli.params.plan.rolling_interval_option import rolling_interval_option
+from tdp.cli.utils import print_deployment
+from tdp.core.models.deployment_model import DeploymentModel
 from tdp.dao import Dao
 
 if TYPE_CHECKING:
-    from tdp.core.collections import Collections
+    from tdp.core.collections.collections import Collections
 
 
 @click.command()

tdp/cli/commands/plan/resume.py

@@ -8,14 +8,15 @@
 import click
 from sqlalchemy import Engine
 
-from tdp.cli.params import collections_option, database_dsn_option
-from tdp.cli.params.plan import preview_option
+from tdp.cli.params.collections_option import collections_option
+from tdp.cli.params.database_dsn_option import database_dsn_option
+from tdp.cli.params.plan.preview_option import preview_option
 from tdp.cli.utils import print_deployment
-from tdp.core.models import DeploymentModel
+from tdp.core.models.deployment_model import DeploymentModel
 from tdp.dao import Dao
 
 if TYPE_CHECKING:
-    from tdp.core.collections import Collections
+    from tdp.core.collections.collections import Collections
 
 
 @click.command()

tdp/cli/commands/status/__init__.py

@@ -3,9 +3,9 @@
 
 import click
 
-from tdp.cli.commands.status.edit import edit
-from tdp.cli.commands.status.generate_stales import generate_stales
-from tdp.cli.commands.status.show import show
+from .edit import edit
+from .generate_stales import generate_stales
+from .show import show
 
 
 @click.group()

tdp/cli/commands/status/edit.py

@@ -8,26 +8,25 @@
 import click
 from sqlalchemy import Engine
 
-from tdp.cli.params import (
-    collections_option,
-    database_dsn_option,
-    hosts_option,
-    validate_option,
-    vars_option,
-)
-from tdp.cli.params.status import component_argument_option, service_argument_option
+from tdp.cli.params.collections_option import collections_option
+from tdp.cli.params.database_dsn_option import database_dsn_option
+from tdp.cli.params.hosts_option import hosts_option
+from tdp.cli.params.status.component_argument import component_argument_option
+from tdp.cli.params.status.service_argument import service_argument_option
+from tdp.cli.params.validate_option import validate_option
+from tdp.cli.params.vars_option import vars_option
 from tdp.cli.utils import check_services_cleanliness, print_hosted_entity_status_log
 from tdp.core.models.sch_status_log_model import (
     SCHStatusLogModel,
     SCHStatusLogSourceEnum,
 )
-from tdp.core.variables import ClusterVariables
+from tdp.core.variables.cluster_variables import ClusterVariables
 from tdp.dao import Dao
 
 if TYPE_CHECKING:
     from pathlib import Path
 
-    from tdp.core.collections import Collections
+    from tdp.core.collections.collections import Collections
 
 
 @click.command()

tdp/cli/commands/status/generate_stales.py

@@ -8,21 +8,20 @@
 import click
 from sqlalchemy import Engine
 
-from tdp.cli.params import (
-    collections_option,
-    database_dsn_option,
-    validate_option,
-    vars_option,
-)
-from tdp.cli.params.status import component_argument_option, service_argument_option
+from tdp.cli.params.collections_option import collections_option
+from tdp.cli.params.database_dsn_option import database_dsn_option
+from tdp.cli.params.status.component_argument import component_argument_option
+from tdp.cli.params.status.service_argument import service_argument_option
+from tdp.cli.params.validate_option import validate_option
+from tdp.cli.params.vars_option import vars_option
 from tdp.cli.utils import check_services_cleanliness, print_hosted_entity_status_log
-from tdp.core.variables import ClusterVariables
+from tdp.core.variables.cluster_variables import ClusterVariables
 from tdp.dao import Dao
 
 if TYPE_CHECKING:
     from pathlib import Path
 
-    from tdp.core.collections import Collections
+    from tdp.core.collections.collections import Collections
 
 
 @click.command()

tdp/cli/commands/status/show.py

@@ -9,29 +9,25 @@
 from sqlalchemy import Engine
 from tabulate import tabulate
 
-from tdp.cli.params import (
-    collections_option,
-    database_dsn_option,
-    hosts_option,
-    validate_option,
-    vars_option,
-)
-from tdp.cli.params.status import (
-    component_argument_option,
-    service_argument_option,
-)
+from tdp.cli.params.collections_option import collections_option
+from tdp.cli.params.database_dsn_option import database_dsn_option
+from tdp.cli.params.hosts_option import hosts_option
+from tdp.cli.params.status.component_argument import component_argument_option
+from tdp.cli.params.status.service_argument import service_argument_option
+from tdp.cli.params.validate_option import validate_option
+from tdp.cli.params.vars_option import vars_option
 from tdp.cli.utils import (
     check_services_cleanliness,
     print_hosted_entity_status_log,
 )
 from tdp.core.models.sch_status_log_model import SCHStatusLogModel
-from tdp.core.variables import ClusterVariables
+from tdp.core.variables.cluster_variables import ClusterVariables
 from tdp.dao import Dao
 
 if TYPE_CHECKING:
     from pathlib import Path
 
-    from tdp.core.collections import Collections
+    from tdp.core.collections.collections import Collections
 
 
 def _filter_stale(stale: Optional[bool], no_stale: Optional[bool]) -> Optional[bool]:

tdp/cli/commands/vars/__init__.py

@@ -3,8 +3,8 @@
 
 import click
 
-from tdp.cli.commands.vars.edit import edit
-from tdp.cli.commands.vars.validate import validate
+from .edit import edit
+from .validate import validate
 
 
 @click.group()