Fix firewall migrate

Author: badrogger

node_cli/migrations/mirage/from_boot.py

@@ -3,24 +3,47 @@
 import os
 from pathlib import Path
 
+from node_cli.core.docker_config import restart_docker_service
 from node_cli.utils.helper import run_cmd
 
 logger = logging.getLogger(__name__)
 
 NFT_CHAIN_BASE_PATH = '/etc/nft.conf.d/skale/chains'
-NFT_COMMITTEE_SCOPE_CHAIN_PATH = 'mirage-committee.conf'
+NFT_COMMITTEE_SCOPE_CHAIN_NAME = 'mirage-committee'
 
 
 class NoLegacyNFTChainConfigError(Exception):
     pass
 
 
-def move_chain_to_new_name() -> None:
+def rename_chain_file(old_filepath: str, new_filepath: str) -> None:
+    old_path = Path(old_filepath)
+    new_path = Path(new_filepath)
+    if not old_path.exists():
+        raise NoLegacyNFTChainConfigError(f'File {old_filepath} does not exists')
+    old_path.rename(Path(new_path))
+
+
+def rename_chain_in_config(config_path: str, old_chain_name: str, new_chain_name: str) -> None:
+    content = ''
+    with open(config_path, 'r') as f:
+        content = f.read()
+
+    updated_content = content.replace(old_chain_name, new_chain_name)
+
+    with open(config_path, 'w') as f:
+        f.write(updated_content)
+
+
+def migrate_nft_chain() -> None:
     after_boot_chain_path = glob.glob(os.path.join(NFT_CHAIN_BASE_PATH, '*'))[0]
-    new_path = os.path.join(NFT_CHAIN_BASE_PATH, NFT_COMMITTEE_SCOPE_CHAIN_PATH)
-    if Path(after_boot_chain_path).exists():
-        raise NoLegacyNFTChainConfigError(f'File {after_boot_chain_path} does not exists')
-    Path(after_boot_chain_path).rename(Path(new_path))
+    old_chain_name = Path(after_boot_chain_path).name.removesuffix('.conf')
+    new_chain_name = NFT_COMMITTEE_SCOPE_CHAIN_NAME
+    rename_chain_in_config(after_boot_chain_path, old_chain_name, new_chain_name)
+    after_migration_chain_path = os.path.join(
+        NFT_CHAIN_BASE_PATH, f'{NFT_COMMITTEE_SCOPE_CHAIN_NAME}.conf'
+    )
+    rename_chain_file(after_boot_chain_path, after_migration_chain_path)
 
 
 def reload_nft():
@@ -29,6 +52,8 @@ def reload_nft():
 
 def migrate_nftables_from_boot():
     logger.info('Starting nftables migration from boot')
-    move_chain_to_new_name()
+    migrate_nft_chain()
     logger.info('Reloading nftables rules')
     reload_nft()
+    logger.info('Restart docker service')
+    restart_docker_service()

node_cli/operations/mirage.py

@@ -60,7 +60,7 @@ class MirageUpdateType(Enum):
 @checked_host
 def update_mirage(env_filepath: str, env: dict, update_type: MirageUpdateType) -> bool:
     compose_rm(node_type=NodeType.MIRAGE, env=env)
-    if update_type in (MirageUpdateType.INFRA_ONLY, MirageUpdateType.FROM_BOOT):
+    if update_type not in (MirageUpdateType.INFRA_ONLY, MirageUpdateType.FROM_BOOT):
         remove_dynamic_containers()
 
     sync_skale_node()