Issue-ID: INF-258
Signed-off-by: Bin Yang <bin.yang@windriver.com>
Change-Id: Ib07fbc73d0f6059d9b99ff70a1b93a58d3f546f6
or cmd.FromState == NfDeploymentState.Abnormal:
if cmd.ToState == NfDeploymentState.Deleting:
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:
cmd2 = commands.DeleteNfDeployment(cmd.NfDeploymentId)
delete_nfdeployment(cmd2, uow)
else:
nfdeployment.descriptorId, nfdeployment.id
))
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(
helm = Helm(logger, LOCAL_HELM_BIN, environment_variables={})
logger.debug('Try to helm del {}'.format(
with uow:
entity: NfDeployment = uow.nfdeployments.get(cmd.NfDeploymentId)
if entity:
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()
# uow.nfdeployments.update(
# cmd.NfDeploymentId, status=NfDeploymentState.Initial)
uow.commit()