From 44ffcde54cb7d832232a32fe7a60b4849bef447a Mon Sep 17 00:00:00 2001 From: tragait Date: Fri, 4 Sep 2020 13:34:35 +0100 Subject: multiple pnf fix Signed-off-by: tragait Change-Id: I3d9d0ebb38da1fb286f097828551e981a0f95a65 Signed-off-by: tragait Issue-ID: SO-3223 Signed-off-by: tragait --- .../resources/process/GenericPnfSWUPDownload.bpmn | 192 ++++++------ .../process/GenericPnfSoftwareUpgrade.bpmn | 252 ++++++++-------- .../resources/process/ServiceLevelUpgrade.bpmn | 333 ++++++++++++--------- 3 files changed, 409 insertions(+), 368 deletions(-) (limited to 'bpmn/so-bpmn-infrastructure-flows/src/main/resources/process') diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/GenericPnfSWUPDownload.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/GenericPnfSWUPDownload.bpmn index 8b1b8367f8..6a0b260a70 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/GenericPnfSWUPDownload.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/GenericPnfSWUPDownload.bpmn @@ -1,10 +1,10 @@ - + SequenceFlow_1fdclh0 - + SequenceFlow_1fdclh0 SequenceFlow_0kusy70 @@ -144,6 +144,88 @@ pnfSwUpgrade.prepareCompletion(execution) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -186,68 +268,21 @@ pnfSwUpgrade.prepareCompletion(execution) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + @@ -266,50 +301,15 @@ pnfSwUpgrade.prepareCompletion(execution) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/GenericPnfSoftwareUpgrade.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/GenericPnfSoftwareUpgrade.bpmn index f4a6196fc1..9b8ce4a7b7 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/GenericPnfSoftwareUpgrade.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/GenericPnfSoftwareUpgrade.bpmn @@ -1,10 +1,10 @@ - + SequenceFlow_1ng4b6l - + SequenceFlow_1ng4b6l SequenceFlow_12ejx4m @@ -174,6 +174,110 @@ pnfSwUpgrade.prepareFalloutHandler(execution) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -183,20 +287,12 @@ pnfSwUpgrade.prepareFalloutHandler(execution) - - - - - - - - @@ -212,160 +308,59 @@ pnfSwUpgrade.prepareFalloutHandler(execution) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - + + + @@ -373,13 +368,18 @@ pnfSwUpgrade.prepareFalloutHandler(execution) - - + + + + + + + + + + + - - - - diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/ServiceLevelUpgrade.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/ServiceLevelUpgrade.bpmn index 3d37430723..8ff1a1efec 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/ServiceLevelUpgrade.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/ServiceLevelUpgrade.bpmn @@ -12,19 +12,21 @@ Flow_10jgbxm - + Flow_1y3cptr Flow_0y1ebox Flow_0mbp7mv + Flow_19tmp99 Flow_0y1ebox - - Flow_0trmo7s - Flow_1z06yyv + + Flow_0zjsp5x Flow_0mxq0qe + Flow_05x2cqc + Flow_02elm5b Flow_0mxq0qe @@ -40,7 +42,7 @@ - Flow_1z06yyv + Flow_02elm5b Flow_01gwzx9 @@ -48,16 +50,9 @@ Flow_1ru18s3 - Flow_1v0mxe7 - Flow_1p4xkdj - - Flow_1b392qs - Flow_1v0mxe7 - import org.onap.so.bpmn.infrastructure.scripts.* -def pnfSwUpgrade = new GenericPnfSoftwareUpgrade() -pnfSwUpgrade.sendResponse(execution) - + Flow_1ptk2a3 + Flow_0l67uzl Flow_0frhsd0 @@ -94,24 +89,23 @@ pnfSwUpgrade.prepareFalloutHandler(execution) - + - - - - - #{execution.getVariable("ControllerStatus").equals("Success")} + + + ${!execution.getVariable("ControllerStatus").equals("Success")} + + + ${!execution.getVariable("ControllerStatus").equals("Success")} - #{execution.getVariable("ControllerStatus").equals("Success")} - - #{execution.getVariable("ControllerStatus").equals("Success")} + ${execution.getVariable("pnfCounter") >= execution.getVariable("pnfSize")} @@ -123,10 +117,9 @@ pnfSwUpgrade.prepareFalloutHandler(execution) - Flow_1p4xkdj - Flow_0trmo7s + Flow_0rpnl02 + Flow_0zjsp5x - @@ -137,7 +130,7 @@ pnfSwUpgrade.prepareFalloutHandler(execution) - Flow_01gwzx9 + Flow_0g6gkgx Flow_1y3cptr @@ -151,7 +144,7 @@ pnfSwUpgrade.prepareFalloutHandler(execution) Flow_05ohtnj Flow_0ny61qm - + #{execution.getVariable("ControllerStatus").equals("Success")} @@ -159,6 +152,29 @@ pnfSwUpgrade.prepareFalloutHandler(execution) + + + + + + ${execution.getVariable("pnfCounter") < execution.getVariable("pnfSize")} + + + ${execution.getVariable("pnfCounter") < execution.getVariable("pnfSize")} + + + ${execution.getVariable("pnfCounter") >= execution.getVariable("pnfSize")} + + + Flow_1ptk2a3 + Flow_05x2cqc + Flow_0rpnl02 + + + Flow_01gwzx9 + Flow_19tmp99 + Flow_0g6gkgx + @@ -166,212 +182,237 @@ pnfSwUpgrade.prepareFalloutHandler(execution) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - - + + + + - + - - + + - - - - - - + + - - + + - + - - - - - - - - - - + + - - - - + + + + - + - - + + - + - - + + - - - - - - - - - + + - + - - - - - - + + - + - - + + - - + + - - + + - - + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - + - + - + - + - - - - - - - - - - - - - - - -- cgit 1.2.3-korg