From 58bc87380d78f987dd7f64eaec0ef1792bb4072c Mon Sep 17 00:00:00 2001 From: hugues de keyzer Date: Wed, 10 Apr 2024 17:15:21 +0200 Subject: [PATCH] add database name to container name --- .../cli/cli_generate_module_analysis.py | 4 ++-- .../cli/cli_install_from_csv.py | 2 +- odoo_openupgrade_wizard/cli/cli_run.py | 2 +- odoo_openupgrade_wizard/cli/cli_upgrade.py | 2 +- odoo_openupgrade_wizard/tools/tools_odoo.py | 22 ++++++++++--------- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/odoo_openupgrade_wizard/cli/cli_generate_module_analysis.py b/odoo_openupgrade_wizard/cli/cli_generate_module_analysis.py index 9ea330b..411e388 100644 --- a/odoo_openupgrade_wizard/cli/cli_generate_module_analysis.py +++ b/odoo_openupgrade_wizard/cli/cli_generate_module_analysis.py @@ -142,5 +142,5 @@ def generate_module_analysis(ctx, step, database, modules): except (KeyboardInterrupt, SystemExit): logger.info("Received Keyboard Interrupt or System Exiting...") finally: - kill_odoo(ctx, initial_step) - kill_odoo(ctx, final_step) + kill_odoo(ctx, initial_database, initial_step) + kill_odoo(ctx, final_database, final_step) diff --git a/odoo_openupgrade_wizard/cli/cli_install_from_csv.py b/odoo_openupgrade_wizard/cli/cli_install_from_csv.py index 344af57..41e1e1b 100644 --- a/odoo_openupgrade_wizard/cli/cli_install_from_csv.py +++ b/odoo_openupgrade_wizard/cli/cli_install_from_csv.py @@ -79,4 +79,4 @@ def install_from_csv(ctx, database, with_demo): except (KeyboardInterrupt, SystemExit): logger.info("Received Keyboard Interrupt or System Exiting...") finally: - kill_odoo(ctx, migration_step) + kill_odoo(ctx, database, migration_step) diff --git a/odoo_openupgrade_wizard/cli/cli_run.py b/odoo_openupgrade_wizard/cli/cli_run.py index 5948181..c3bbc78 100644 --- a/odoo_openupgrade_wizard/cli/cli_run.py +++ b/odoo_openupgrade_wizard/cli/cli_run.py @@ -77,4 +77,4 @@ def run( except (KeyboardInterrupt, SystemExit): logger.info("Received Keyboard Interrupt or System Exiting...") finally: - kill_odoo(ctx, migration_step) + kill_odoo(ctx, database, migration_step) diff --git a/odoo_openupgrade_wizard/cli/cli_upgrade.py b/odoo_openupgrade_wizard/cli/cli_upgrade.py index 55f0481..a29bf41 100644 --- a/odoo_openupgrade_wizard/cli/cli_upgrade.py +++ b/odoo_openupgrade_wizard/cli/cli_upgrade.py @@ -43,5 +43,5 @@ def upgrade(ctx, first_step, last_step, database, with_demo): except (KeyboardInterrupt, SystemExit): logger.info("Received Keyboard Interrupt or System Exiting...") finally: - kill_odoo(ctx, migration_step) + kill_odoo(ctx, database, migration_step) execute_click_odoo_python_files(ctx, database, migration_step) diff --git a/odoo_openupgrade_wizard/tools/tools_odoo.py b/odoo_openupgrade_wizard/tools/tools_odoo.py index bbfb0d9..7ea931f 100644 --- a/odoo_openupgrade_wizard/tools/tools_odoo.py +++ b/odoo_openupgrade_wizard/tools/tools_odoo.py @@ -107,13 +107,15 @@ def get_docker_image_tag(ctx, odoo_version: float) -> str: ) -def get_docker_container_name(ctx, migration_step: dict) -> str: - """Return a docker container name, based on project name, +def get_docker_container_name(ctx, database: str, migration_step: dict) -> str: + """Return a docker container name, based on project name, database name, odoo version and migration step""" - return "odoo-openupgrade-wizard-container__%s__%s__step-%s" % ( - ctx.obj["config"]["project_name"], - str(migration_step["version"]).rjust(4, "0"), - str(migration_step["name"]).rjust(2, "0"), + return "oow-{project}-{database}-{version}-step-{step}".format( + project=ctx.obj["config"]["project_name"], + database=database, + # FIXME: version should be a string, but it is a float + version=str(migration_step["version"]).rjust(4, "0"), + step=str(migration_step["name"]).rjust(2, "0"), ) @@ -280,7 +282,7 @@ def run_container_odoo( return run_container( get_docker_image_tag(ctx, migration_step["version"]), - get_docker_container_name(ctx, migration_step), + get_docker_container_name(ctx, database, migration_step), command=command, ports={ host_xmlrpc_port: 8069, @@ -295,8 +297,8 @@ def run_container_odoo( ) -def kill_odoo(ctx, migration_step: dict): - kill_container(get_docker_container_name(ctx, migration_step)) +def kill_odoo(ctx, database, migration_step: dict): + kill_container(get_docker_container_name(ctx, database, migration_step)) def execute_click_odoo_python_files( @@ -351,7 +353,7 @@ def execute_click_odoo_python_files( ) raise e finally: - kill_odoo(ctx, migration_step) + kill_odoo(ctx, database, migration_step) def get_odoo_modules_from_csv(module_file_path: Path) -> list: