From a4f473f12618d2cb3ab3cbf97c33e7f1f39d2dac Mon Sep 17 00:00:00 2001 From: Paul Farault Date: Mon, 13 Nov 2023 17:15:13 +0100 Subject: [PATCH] refactor: rename i to operation_order --- tdp/core/models/deployment_model.py | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/tdp/core/models/deployment_model.py b/tdp/core/models/deployment_model.py index 9004a625..03873179 100644 --- a/tdp/core/models/deployment_model.py +++ b/tdp/core/models/deployment_model.py @@ -211,7 +211,7 @@ def from_operations( }, status=DeploymentStateEnum.PLANNED, ) - i = 1 + operation_order = 1 for operation in operations: can_perform_rolling_restart = ( rolling_interval is not None @@ -228,18 +228,18 @@ def from_operations( deployment.operations.append( OperationModel( operation=operation.name, - operation_order=i, + operation_order=operation_order, host=host_name, extra_vars=list(extra_vars) if extra_vars else None, state=OperationStateEnum.PLANNED, ) ) if can_perform_rolling_restart: - i += 1 + operation_order += 1 deployment.operations.append( OperationModel( operation=OPERATION_SLEEP_NAME, - operation_order=i, + operation_order=operation_order, host=host_name, extra_vars=[ f"{OPERATION_SLEEP_VARIABLE}={rolling_interval}" @@ -247,7 +247,7 @@ def from_operations( state=OperationStateEnum.PLANNED, ) ) - i += 1 + operation_order += 1 return deployment @staticmethod @@ -270,7 +270,9 @@ def from_operations_hosts_vars( status=DeploymentStateEnum.PLANNED, ) - for order, operation_host_vars in enumerate(operation_host_vars_names, start=1): + for operation_order, operation_host_vars in enumerate( + operation_host_vars_names, start=1 + ): operation_name, host_name, var_names = operation_host_vars if host_name is not None: collections.check_operations_hosts_exist( @@ -285,7 +287,7 @@ def from_operations_hosts_vars( deployment.operations.append( OperationModel( operation=operation_name, - operation_order=order, + operation_order=operation_order, host=host_name, extra_vars=var_names, state=OperationStateEnum.PLANNED, @@ -406,8 +408,10 @@ def from_failed_deployment( failed_operation_id = next( ( - i - for i, operation in enumerate(failed_deployment.operations) + operation_order + for operation_order, operation in enumerate( + failed_deployment.operations + ) if operation.state == OperationStateEnum.FAILURE ), None, @@ -428,12 +432,12 @@ def from_failed_deployment( deployment.operations = [ OperationModel( operation=operation, - operation_order=i, + operation_order=operation_order, host=host, extra_vars=extra_vars, state=OperationStateEnum.PLANNED, ) - for i, (operation, host, extra_vars) in enumerate( + for operation_order, (operation, host, extra_vars) in enumerate( operations_tuple_to_resume, 1 ) ]