From 23021f6c24ad8722495fc42f98a18cc650906bca Mon Sep 17 00:00:00 2001 From: Bin Yang Date: Mon, 24 Jan 2022 16:25:13 +0800 Subject: [PATCH] Fix nfdeployment uninstalling issue Issue-ID: INF-258 Signed-off-by: Bin Yang Change-Id: Ib07fbc73d0f6059d9b99ff70a1b93a58d3f546f6 --- o2dms/service/nfdeployment_handler.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/o2dms/service/nfdeployment_handler.py b/o2dms/service/nfdeployment_handler.py index 665e03e..f945ce9 100644 --- a/o2dms/service/nfdeployment_handler.py +++ b/o2dms/service/nfdeployment_handler.py @@ -72,8 +72,8 @@ def handle_nfdeployment_statechanged( or cmd.FromState == NfDeploymentState.Abnormal: if cmd.ToState == NfDeploymentState.Deleting: - cmd2 = commands.UninstallNfDeployment(cmd.NfDeploymentId) - uninstall_nfdeployment(cmd2, uow) + # cmd2 = commands.UninstallNfDeployment(cmd.NfDeploymentId) + # uninstall_nfdeployment(cmd2, uow) cmd2 = commands.DeleteNfDeployment(cmd.NfDeploymentId) delete_nfdeployment(cmd2, uow) else: @@ -198,7 +198,12 @@ def uninstall_nfdeployment( nfdeployment.descriptorId, nfdeployment.id )) - nfdeployment.set_state(NfDeploymentState.Uninstalling) + with uow: + entity: NfDeployment = uow.nfdeployments.get(cmd.NfDeploymentId) + if entity: + entity.set_state(NfDeploymentState.Uninstalling) + uow.commit() + helm = Helm(logger, LOCAL_HELM_BIN, environment_variables={}) logger.debug('Try to helm del {}'.format( @@ -217,7 +222,8 @@ def uninstall_nfdeployment( with uow: entity: NfDeployment = uow.nfdeployments.get(cmd.NfDeploymentId) if entity: - entity.transit_state(NfDeploymentState.Initial) + entity.set_state(NfDeploymentState.Initial) + entity.transit_state(NfDeploymentState.Deleting) # uow.nfdeployments.update( # cmd.NfDeploymentId, status=NfDeploymentState.Initial) uow.commit() -- 2.16.6