Use proper CliMetaManager for mirage operations

Author: badrogger

node_cli/configs/user.py

@@ -130,8 +130,8 @@ def get_validated_user_config(
     is_mirage_boot: bool = False,
 ) -> BaseUserConfig:
     params = parse_env_file(env_filepath)
-    user_config_type = get_user_config_type(node_type, is_mirage_boot)
-    _, missing_params, extra_params = user_config_type.validate_params(params)
+    user_config_class = get_user_config_class(node_type, is_mirage_boot)
+    _, missing_params, extra_params = user_config_class.validate_params(params)
 
     if len(missing_params) > 0:
         error_exit(f'Missing required parameters: {missing_params}')
@@ -140,7 +140,7 @@ def get_validated_user_config(
         error_exit(f'Extra parameters: {extra_params}')
 
     params = to_lower_keys(params)
-    user_config = user_config_type(**params)
+    user_config = user_config_class(**params)
     validate_user_config(user_config)
 
     return user_config
@@ -155,8 +155,7 @@ def validate_user_config(user_config: BaseUserConfig) -> None:
     else:
         contract_alias_or_address = user_config.manager_contracts
         endpoint = user_config.endpoint
-
-    validate_alias_or_address(contract_alias_or_address, ContractType.MANAGER, endpoint)
+        validate_alias_or_address(contract_alias_or_address, ContractType.MANAGER, endpoint)
 
     if isinstance(user_config, (SkaleUserConfig, MirageBootUserConfig)):
         validate_alias_or_address(user_config.ima_contracts, ContractType.IMA, endpoint)
@@ -172,19 +171,19 @@ def parse_env_file(env_filepath: str) -> Dict:
     return DotEnv(env_filepath).dict()
 
 
-def get_user_config_type(
+def get_user_config_class(
     node_type: NodeType,
     is_mirage_boot: bool = False,
 ) -> type[BaseUserConfig]:
     if node_type == NodeType.MIRAGE and is_mirage_boot:
-        user_config_type = MirageBootUserConfig
+        user_config_class = MirageBootUserConfig
     elif node_type == NodeType.MIRAGE:
-        user_config_type = MirageUserConfig
+        user_config_class = MirageUserConfig
     elif node_type == NodeType.SYNC:
-        user_config_type = SyncUserConfig
+        user_config_class = SyncUserConfig
     else:
-        user_config_type = SkaleUserConfig
-    return user_config_type
+        user_config_class = SkaleUserConfig
+    return user_config_class
 
 
 def validate_env_type(env_type: str) -> None:

node_cli/core/mirage_node.py

@@ -21,10 +21,10 @@
 import logging
 import time
 
-from node_cli.configs import SKALE_DIR, RESTORE_SLEEP_TIMEOUT
+from node_cli.configs import RESTORE_SLEEP_TIMEOUT, SKALE_DIR
 from node_cli.core.host import save_env_params
 from node_cli.core.node import compose_node_env, is_base_containers_alive
-from node_cli.operations import update_mirage_op, restore_mirage_op, MirageUpdateType
+from node_cli.operations import MirageUpdateType, restore_mirage_op, update_mirage_op
 from node_cli.utils.decorators import check_inited, check_not_inited, check_user
 from node_cli.utils.exit_codes import CLIExitCodes
 from node_cli.utils.helper import error_exit
@@ -54,7 +54,7 @@ def restore_mirage(backup_path, env_filepath, config_only=False):
 def migrate_from_boot(
     env_filepath: str,
 ) -> None:
-    logger.info('Node update started')
+    logger.info('Migrating from boot to mirage node...')
     env = compose_node_env(
         env_filepath,
         inited_node=True,
@@ -67,4 +67,4 @@ def migrate_from_boot(
         print_node_cmd_error()
         return
     else:
-        logger.info('Mirgration from boot to mirage completed successfully')
+        logger.info('Migration from boot to mirage completed successfully')

node_cli/operations/__init__.py

@@ -22,8 +22,7 @@
     init as init_op,
     init_sync as init_sync_op,
     init_mirage_boot as init_mirage_boot_op,
-    migrate_mirage_boot as migrate_mirage_boot_op,
-    update_mirage_boot as update_mirage_boot_op,
+    update_mirage_boot as update_miage_boot_op,
     update_sync as update_sync_op,
     turn_off as turn_off_op,
     turn_on as turn_on_op,

node_cli/operations/base.py

@@ -150,47 +150,6 @@ def update(env_filepath: str, env: Dict, node_type: NodeType) -> bool:
     return True
 
 
-@checked_host
-def migrate_mirage_boot(env_filepath: str, env: Dict) -> bool:
-    compose_rm(node_type=NodeType.MIRAGE, env=env)
-    cleanup_volume_artifacts(env['DISK_MOUNTPOINT'])
-
-    sync_skale_node()
-    ensure_btrfs_kernel_module_autoloaded()
-
-    if env.get('SKIP_DOCKER_CONFIG') != 'True':
-        configure_docker()
-
-    enable_monitoring = str_to_bool(env.get('MONITORING_CONTAINERS', 'False'))
-    configure_nftables(enable_monitoring=enable_monitoring)
-
-    generate_nginx_config()
-
-    prepare_host(env_filepath, env['ENV_TYPE'])
-
-    meta_manager = CliMetaManager()
-    current_stream = meta_manager.get_meta_info().config_stream
-    skip_cleanup = env.get('SKIP_DOCKER_CLEANUP') == 'True'
-    if not skip_cleanup and current_stream != env['CONTAINER_CONFIGS_STREAM']:
-        logger.info(
-            'Stream version was changed from %s to %s',
-            current_stream,
-            env['CONTAINER_CONFIGS_STREAM'],
-        )
-        docker_cleanup()
-
-    meta_manager.update_meta(
-        VERSION,
-        env['CONTAINER_CONFIGS_STREAM'],
-        None,
-        distro.id(),
-        distro.version(),
-    )
-    update_images(env=env, node_type=NodeType.MIRAGE)
-    compose_up(env=env, node_type=NodeType.MIRAGE)
-    return True
-
-
 @checked_host
 def update_mirage_boot(env_filepath: str, env: Dict) -> bool:
     compose_rm(node_type=NodeType.MIRAGE, env=env)
@@ -288,11 +247,10 @@ def init_mirage_boot(env_filepath: str, env: dict) -> None:
     generate_nginx_config()
     prepare_block_device(env['DISK_MOUNTPOINT'], force=env['ENFORCE_BTRFS'] == 'True')
 
-    meta_manager = CliMetaManager()
+    meta_manager = MirageCliMetaManager()
     meta_manager.update_meta(
         VERSION,
         env['CONTAINER_CONFIGS_STREAM'],
-        None,
         distro.id(),
         distro.version(),
     )

node_cli/operations/mirage.py

@@ -81,7 +81,7 @@ def update_mirage(env_filepath: str, env: dict, update_type: MirageUpdateType) -
         )
         docker_cleanup()
 
-    MirageCliMetaManager().update_meta(
+    meta_manager.update_meta(
         VERSION,
         env['CONTAINER_CONFIGS_STREAM'],
         distro.id(),

node_cli/utils/meta.py

@@ -2,7 +2,6 @@
 import json
 import os
 from dataclasses import dataclass
-from typing import Optional
 
 from node_cli.configs import META_FILEPATH
 
@@ -107,7 +106,7 @@ def update_meta(
         self,
         version: str,
         config_stream: str,
-        docker_lvmpy_stream: Optional[str],
+        docker_lvmpy_stream: str | None,
         os_id: str,
         os_version: str,
     ) -> None: