From eeaf0330f835b237812bbbf26ca5bba3c44f4671 Mon Sep 17 00:00:00 2001 From: "Kalkere Ramesh, Sharan (sk720x)" Date: Wed, 21 Oct 2020 19:03:26 -0400 Subject: PNF service instantiation using building blocks fails End flow if ControllerExecutionBB is last in list Change-Id: Ia7020572a4418e7cbd5a9d167788f6476ff3554a Issue-ID: SO-3322 Signed-off-by: Kalkere Ramesh, Sharan --- .../subprocess/BuildingBlock/WorkflowActionBB.bpmn | 575 +++++++++++---------- 1 file changed, 295 insertions(+), 280 deletions(-) (limited to 'bpmn/so-bpmn-building-blocks') diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/WorkflowActionBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/WorkflowActionBB.bpmn index 5fd9701880..b4954e0b75 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/WorkflowActionBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/WorkflowActionBB.bpmn @@ -1,5 +1,5 @@ - + @@ -41,7 +41,7 @@ SequenceFlow_0mqrkxv - SequenceFlow_1fftixk + SequenceFlow_16fwl31 SequenceFlow_1m2eezj SequenceFlow_0v588sm SequenceFlow_11530ei @@ -49,7 +49,7 @@ SequenceFlow_0l7kaba - ${execution.getVariable("completed")==true&&execution.getVariable("isRollback")==false&&execution.getVariable("handlingCode")=="Success"} + SequenceFlow_15s0okp @@ -86,7 +86,7 @@ - ${execution.getVariable("isTopLevelFlow")==true&&execution.getVariable("sentSyncResponse")==false} + @@ -95,10 +95,10 @@ - ${execution.getVariable("handlingCode")=="Rollback"||execution.getVariable("handlingCode")=="RollbackToAssigned"||execution.getVariable("handlingCode")=="RollbackToCreated"||execution.getVariable("handlingCode")=="RollbackToCreatedNoConfiguration"} + - ${execution.getVariable("isRollbackNeeded")==true} + SequenceFlow_0v588sm @@ -107,7 +107,7 @@ - ${execution.getVariable("handlingCode")=="Abort"} + SequenceFlow_02ksbt0 @@ -130,7 +130,7 @@ - ${execution.getVariable("isTopLevelFlow")==false} + SequenceFlow_11530ei @@ -139,7 +139,7 @@ - ${execution.getVariable("isTopLevelFlow")==false} + SequenceFlow_1m2eezj @@ -147,13 +147,13 @@ SequenceFlow_0kf5sen - ${execution.getVariable("isTopLevelFlow")==false} + SequenceFlow_1ui67mc - ${execution.getVariable("isRollbackNeeded")==false} + SequenceFlow_11dlyzt @@ -161,7 +161,7 @@ SequenceFlow_1ui67mc - ${execution.getVariable("completed")==true&&execution.getVariable("isRollback")==true&&execution.getVariable("handlingCode")=="Success"} + @@ -193,10 +193,9 @@ SequenceFlow_1hsqed1 - SequenceFlow_1fftixk + SequenceFlow_0tps01a - SequenceFlow_1lrz41x @@ -205,302 +204,399 @@ - ${execution.getVariable("generateIdsOnly") == null || execution.getVariable("generateIdsOnly")==false} + SequenceFlow_0ilo6lo + + SequenceFlow_0tps01a + SequenceFlow_16fwl31 + + + - - + + + - + - - - + + + + - + - - - - + + + + - + - - - - - - + + + - + - - - - - + + + - + - - - - - + + + + + - + - - - - - - - - - - - - - + + + - + - - - - - + + + + + - + - - - + + + + + - + - - - - - + + + + - + - - - + + + + + - + - - - - - - + + + + + - + - - - - + + + + - + - - - - - + + + + + - + - - - - - - + + + + - + - - - - - + + + + - + - - - - - + + + - + - + - - - + + + - - - + + + + + - + - - + + + + + - + - - - - - + + + + + - + - - - + + + - + - - + + + - + - - - - - - + + + + + - + - - + + + + - + - - - - - + + + + + - + - - + + + + + + + + + + + + + + + + + + + - - + + + + + - - - - - + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + - + + + + + + + + + + - - + + - - - - - + + + - + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + - + - - - - - + + + + + + - + - - - - + + + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -516,108 +612,27 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit 1.2.3-korg