From 7e0995d7b6fc0e21438c4fd0150d788bddf637d9 Mon Sep 17 00:00:00 2001 From: "Benjamin, Max (mb388a)" Date: Mon, 17 Sep 2018 10:24:34 -0400 Subject: Updated error handling of BPMN sub flows Added error handling subprocess to only those BBs that call a sub flow. Refactored error handling in ExecuteBuildingBlock. Added error handling and enhanced modeling of remaing BB flows Added error handling and enhanced modeling of assign/activate BBs. Change-Id: I2ab6236e3c2206b74b6368db69d8953a779f4f19 Issue-ID: SO-1059 Signed-off-by: Benjamin, Max (mb388a) --- .../onap/so/client/exception/ExceptionBuilder.java | 10 +- .../BuildingBlock/AAICheckVnfInMaintBB.bpmn | 16 +- .../BuildingBlock/AAISetVnfInMaintBB.bpmn | 24 +- .../BuildingBlock/AAIUnsetVnfInMaintBB.bpmn | 24 +- .../BuildingBlock/ActivateNetworkBB.bpmn | 16 +- .../BuildingBlock/ActivateNetworkCollectionBB.bpmn | 30 +-- .../BuildingBlock/ActivateServiceInstanceBB.bpmn | 10 +- .../BuildingBlock/ActivateVfModuleBB.bpmn | 34 +-- .../subprocess/BuildingBlock/ActivateVnfBB.bpmn | 36 +-- .../BuildingBlock/ActivateVolumeGroupBB.bpmn | 22 +- .../subprocess/BuildingBlock/AssignNetworkBB.bpmn | 215 ++++++++------- .../BuildingBlock/AssignServiceInstanceBB.bpmn | 82 +++--- .../subprocess/BuildingBlock/AssignVfModuleBB.bpmn | 60 ++--- .../subprocess/BuildingBlock/AssignVnfBB.bpmn | 186 ++++++++----- .../BuildingBlock/AssignVolumeGroupBB.bpmn | 26 +- .../ChangeModelServiceInstanceBB.bpmn | 28 +- .../BuildingBlock/ChangeModelVfModuleBB.bpmn | 28 +- .../subprocess/BuildingBlock/ChangeModelVnfBB.bpmn | 43 ++- .../subprocess/BuildingBlock/CreateCustomerBB.bpmn | 6 +- .../subprocess/BuildingBlock/CreateNetworkBB.bpmn | 18 +- .../BuildingBlock/CreateNetworkCollectionBB.bpmn | 18 +- .../subprocess/BuildingBlock/CreateVfModuleBB.bpmn | 109 +++++--- .../BuildingBlock/CreateVolumeGroupBB.bpmn | 43 ++- .../BuildingBlock/DeactivateNetworkBB.bpmn | 44 ++-- .../BuildingBlock/DeactivateServiceInstanceBB.bpmn | 6 +- .../BuildingBlock/DeactivateVfModuleBB.bpmn | 6 +- .../subprocess/BuildingBlock/DeactivateVnfBB.bpmn | 6 +- .../BuildingBlock/DeactivateVolumeGroupBB.bpmn | 4 +- .../subprocess/BuildingBlock/DeleteNetworkBB.bpmn | 28 +- .../subprocess/BuildingBlock/DeleteVfModuleBB.bpmn | 41 ++- .../BuildingBlock/DeleteVolumeGroupBB.bpmn | 38 ++- .../BuildingBlock/ExecuteBuildingBlock.bpmn | 293 +++++++++------------ .../BuildingBlock/UnassignNetworkBB.bpmn | 4 +- .../BuildingBlock/UnassignServiceInstanceBB.bpmn | 26 +- .../BuildingBlock/UnassignVfModuleBB.bpmn | 30 +-- .../subprocess/BuildingBlock/UnassignVnfBB.bpmn | 14 +- .../BuildingBlock/UnassignVolumeGroupBB.bpmn | 4 +- .../subprocess/BuildingBlock/UpdateNetworkBB.bpmn | 33 --- .../subprocess/BuildingBlock/VnfAdapter.bpmn | 4 +- 39 files changed, 921 insertions(+), 744 deletions(-) (limited to 'bpmn') diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/exception/ExceptionBuilder.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/exception/ExceptionBuilder.java index c74e81506c..42da72528f 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/exception/ExceptionBuilder.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/exception/ExceptionBuilder.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -37,9 +37,9 @@ public class ExceptionBuilder { String msg = "Exception in %s.%s "; try{ msoLogger.error(exception); - + String errorVariable = "Error%s%s"; - + StackTraceElement[] trace = Thread.currentThread().getStackTrace(); for (StackTraceElement traceElement : trace) { if (!traceElement.getClassName().equals(this.getClass().getName()) && !traceElement.getClassName().equals(Thread.class.getName())) { @@ -49,7 +49,7 @@ public class ExceptionBuilder { break; } } - + msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, msg, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, msg.toString()); execution.setVariable(errorVariable, exception.getMessage()); } catch (Exception ex){ diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AAICheckVnfInMaintBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AAICheckVnfInMaintBB.bpmn index de0f450624..99d03d69d7 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AAICheckVnfInMaintBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AAICheckVnfInMaintBB.bpmn @@ -1,10 +1,10 @@ - + - + SequenceFlow_0zaz9o2 - + SequenceFlow_1jwsja5 @@ -17,9 +17,9 @@ - + - + @@ -32,10 +32,10 @@ - + - + @@ -47,4 +47,4 @@ - \ No newline at end of file + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AAISetVnfInMaintBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AAISetVnfInMaintBB.bpmn index b2e100061d..c55b519def 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AAISetVnfInMaintBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AAISetVnfInMaintBB.bpmn @@ -1,10 +1,10 @@ - + - + SequenceFlow_0zaz9o2 - + SequenceFlow_1jwsja5 @@ -17,34 +17,34 @@ - + - + - + - + - + - + - + - + - \ No newline at end of file + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AAIUnsetVnfInMaintBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AAIUnsetVnfInMaintBB.bpmn index 7335f8677c..463b82d88c 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AAIUnsetVnfInMaintBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AAIUnsetVnfInMaintBB.bpmn @@ -1,10 +1,10 @@ - + - + SequenceFlow_0zaz9o2 - + SequenceFlow_1jwsja5 @@ -17,22 +17,22 @@ - + - + - + - + - + - + @@ -40,11 +40,11 @@ - + - + - \ No newline at end of file + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ActivateNetworkBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ActivateNetworkBB.bpmn index 6ca3745f43..dc6e4a8d94 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ActivateNetworkBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ActivateNetworkBB.bpmn @@ -1,17 +1,17 @@ - + - + SequenceFlow_05elmhj - + SequenceFlow_18atf08 - + SequenceFlow_05elmhj SequenceFlow_0xbvwsu - + SequenceFlow_0xbvwsu SequenceFlow_18atf08 @@ -26,13 +26,13 @@ - + - + @@ -68,4 +68,4 @@ - \ No newline at end of file + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ActivateNetworkCollectionBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ActivateNetworkCollectionBB.bpmn index 87a1dae090..e927a78017 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ActivateNetworkCollectionBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ActivateNetworkCollectionBB.bpmn @@ -1,13 +1,13 @@ - + - + SequenceFlow_05elmhj - + SequenceFlow_18atf08 - + SequenceFlow_05elmhj SequenceFlow_18atf08 @@ -19,32 +19,32 @@ - + - + - + - + - + - - + + - + - - + + - + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ActivateServiceInstanceBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ActivateServiceInstanceBB.bpmn index 3d55ecd8f6..47cd3cf30b 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ActivateServiceInstanceBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ActivateServiceInstanceBB.bpmn @@ -1,10 +1,10 @@ - + - + SequenceFlow_1byfr8v - + SequenceFlow_0pioehv @@ -13,7 +13,7 @@ SequenceFlow_00q7fsg - + SequenceFlow_00q7fsg SequenceFlow_0pioehv @@ -24,7 +24,7 @@ - + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ActivateVfModuleBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ActivateVfModuleBB.bpmn index b118d9b71c..c7b7952f02 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ActivateVfModuleBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ActivateVfModuleBB.bpmn @@ -1,19 +1,19 @@ - + - + SequenceFlow_0ieafii - + SequenceFlow_0xsp0pv - + SequenceFlow_0ieafii SequenceFlow_14kvrbe - + SequenceFlow_14kvrbe SequenceFlow_0xsp0pv @@ -30,35 +30,35 @@ - + - + - + - + - + - - + + - + - + - - + + - + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ActivateVnfBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ActivateVnfBB.bpmn index 61d8f6eb44..1147283160 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ActivateVnfBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ActivateVnfBB.bpmn @@ -1,20 +1,20 @@ - + - + SequenceFlow_0k9qnoi - + SequenceFlow_0vnitwg - + SequenceFlow_0k9qnoi SequenceFlow_0r6pzwt - + SequenceFlow_0r6pzwt SequenceFlow_0vnitwg @@ -24,41 +24,41 @@ - + - + - + - - + + - + - + - + - - + + - + - + - + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ActivateVolumeGroupBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ActivateVolumeGroupBB.bpmn index 03ba8bbe43..bb79e552e7 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ActivateVolumeGroupBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ActivateVolumeGroupBB.bpmn @@ -1,14 +1,14 @@ - + - + SequenceFlow_1wz1rfg SequenceFlow_0mh0v9h - + SequenceFlow_1wz1rfg SequenceFlow_0mh0v9h @@ -26,25 +26,25 @@ - + - + - + - + - + - - + + - + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AssignNetworkBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AssignNetworkBB.bpmn index 57c342455d..5f7b29b3ab 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AssignNetworkBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AssignNetworkBB.bpmn @@ -1,63 +1,68 @@ - + - + SequenceFlow_11op1ih - - SequenceFlow_0mxc4ri - SequenceFlow_017131q - SequenceFlow_32 + + SequenceFlow_0jm95hf + SequenceFlow_16hhbw3 - - SequenceFlow_32 - SequenceFlow_0do51t8 + + SequenceFlow_16hhbw3 + SequenceFlow_0oawye1 - - - + SequenceFlow_0gkr871 SequenceFlow_1ctpnpe - - SequenceFlow_0do51t8 - SequenceFlow_0ln3hj3 + + SequenceFlow_0oawye1 + SequenceFlow_0988gld - - SequenceFlow_11op1ih - SequenceFlow_017131q - SequenceFlow_0gkr871 - - + - - SequenceFlow_0ln3hj3 + + SequenceFlow_0988gld - - + SequenceFlow_07z7hcu SequenceFlow_0e08b9t - + SequenceFlow_0e08b9t SequenceFlow_0mxc4ri - - + + SequenceFlow_1ctpnpe SequenceFlow_0fwcvep - + SequenceFlow_0fwcvep SequenceFlow_07z7hcu + + SequenceFlow_11op1ih + SequenceFlow_017131q + SequenceFlow_0gkr871 + + + SequenceFlow_017131q + SequenceFlow_0mxc4ri + SequenceFlow_0jm95hf + + + + + sets Cloud Region on BB execution for SDNC assign @@ -70,138 +75,154 @@ - + - + - + - + - - - - - - - - - - - - - - - + - - + + - + - - - - - - - + - - - + + + + - + - + + - + - + - + - - - - - - - - + - + - + - + - - + + - + - - + + - + - - + + + - + - + - + - - + + - + - - + + - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AssignServiceInstanceBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AssignServiceInstanceBB.bpmn index f68fc91584..d1f2286258 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AssignServiceInstanceBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AssignServiceInstanceBB.bpmn @@ -1,22 +1,22 @@ - + - + SequenceFlow_1xr6chl - + SequenceFlow_1h6t7yr SequenceFlow_0czewtx - + SequenceFlow_0czewtx SequenceFlow_1t55i01 - + SequenceFlow_1t55i01 SequenceFlow_0aef1l8 - + SequenceFlow_0aef1l8 SequenceFlow_07ea5ui @@ -24,16 +24,16 @@ - + SequenceFlow_14xl505 - + SequenceFlow_07ea5ui SequenceFlow_14xl505 - + SequenceFlow_1xr6chl SequenceFlow_1h6t7yr @@ -43,84 +43,84 @@ - + - + - + - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - + - + - - + + - + - + - - + + - + - + - - + + - + - + \ No newline at end of file diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AssignVfModuleBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AssignVfModuleBB.bpmn index b7ce68eace..92b03a79d0 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AssignVfModuleBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AssignVfModuleBB.bpmn @@ -1,30 +1,30 @@ - + - + SequenceFlow_1xr6chl - + SequenceFlow_1xr6chl SequenceFlow_0czewtx - + SequenceFlow_0574gaa SequenceFlow_15hn8si - + SequenceFlow_14xl505 - + SequenceFlow_15hn8si SequenceFlow_14xl505 - + SequenceFlow_0czewtx SequenceFlow_0574gaa @@ -32,63 +32,63 @@ - + - + - + - + - - + + - + - - + + - + - + - + - - + + - + - + - - + + - + - - + + - + - + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AssignVnfBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AssignVnfBB.bpmn index f1a023910b..8765bca20c 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AssignVnfBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AssignVnfBB.bpmn @@ -1,44 +1,38 @@ - + - + SequenceFlow_0zaz9o2 - - SequenceFlow_11jum90 - SequenceFlow_0v8d14a + + SequenceFlow_14mpqit SequenceFlow_1ks8kmt - + SequenceFlow_0csh9dc - + SequenceFlow_0zaz9o2 SequenceFlow_1jwsja5 - + SequenceFlow_1ks8kmt SequenceFlow_0csh9dc - + SequenceFlow_1lppa2m SequenceFlow_1nle8kc - - SequenceFlow_1nle8kc - SequenceFlow_11jum90 - SequenceFlow_1uiok7v - - + - + @@ -50,127 +44,187 @@ - + SequenceFlow_1jwsja5 SequenceFlow_169g0ir - + SequenceFlow_169g0ir SequenceFlow_1lppa2m + + + SequenceFlow_1i52a7x + + + + SequenceFlow_1i52a7x + + + + + + + SequenceFlow_1nle8kc + SequenceFlow_11jum90 + SequenceFlow_1uiok7v + + + SequenceFlow_11jum90 + SequenceFlow_0v8d14a + SequenceFlow_14mpqit + - + - + - + - + - + - + - - + + - + - - + + - + - - + + - + - + - + - - + + - + - - + + - + - - - - - - - - + + + + - + - - - + + + - + - - + + + - + - + - - + + - + - - + + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AssignVolumeGroupBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AssignVolumeGroupBB.bpmn index b1626c8a53..7331d84e05 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AssignVolumeGroupBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AssignVolumeGroupBB.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_1wz1rfg @@ -8,7 +8,7 @@ SequenceFlow_0mh0v9h - + SequenceFlow_1wz1rfg SequenceFlow_0mh0v9h @@ -19,32 +19,32 @@ - + - + - - + + - + - + - + - + - - + + - + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ChangeModelServiceInstanceBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ChangeModelServiceInstanceBB.bpmn index 6641516bfa..fa0c7f4f44 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ChangeModelServiceInstanceBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ChangeModelServiceInstanceBB.bpmn @@ -1,20 +1,20 @@ - + - + SequenceFlow_18i4a05 - + SequenceFlow_0g502yj - + SequenceFlow_18i4a05 SequenceFlow_19kfk17 - + SequenceFlow_19kfk17 SequenceFlow_0g502yj @@ -38,30 +38,30 @@ - + - + - - + + - + - + - + - + - + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ChangeModelVfModuleBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ChangeModelVfModuleBB.bpmn index a48abe25a1..fd247d26eb 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ChangeModelVfModuleBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ChangeModelVfModuleBB.bpmn @@ -1,19 +1,19 @@ - + - + SequenceFlow_0ieafii - + SequenceFlow_0xsp0pv - + SequenceFlow_0ieafii SequenceFlow_14kvrbe - + SequenceFlow_14kvrbe SequenceFlow_0xsp0pv @@ -30,9 +30,9 @@ - + - + @@ -42,23 +42,23 @@ - + - - + + - + - + - + - + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ChangeModelVnfBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ChangeModelVnfBB.bpmn index 68f491e1f0..b320c12a5e 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ChangeModelVnfBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ChangeModelVnfBB.bpmn @@ -1,23 +1,34 @@ - + - + SequenceFlow_18i4a05 - + SequenceFlow_0g502yj - + SequenceFlow_18i4a05 SequenceFlow_19kfk17 - + SequenceFlow_19kfk17 SequenceFlow_0g502yj + + + SequenceFlow_0s2743f + + + + SequenceFlow_0s2743f + + + + @@ -63,6 +74,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateCustomerBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateCustomerBB.bpmn index 1e88963c21..42c6383f8b 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateCustomerBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateCustomerBB.bpmn @@ -1,14 +1,14 @@ - + - + SequenceFlow_1wz1rfg SequenceFlow_0kfkpbh - + SequenceFlow_1wz1rfg SequenceFlow_0kfkpbh diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateNetworkBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateNetworkBB.bpmn index 0d2d829b6b..609edf4b9b 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateNetworkBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateNetworkBB.bpmn @@ -1,29 +1,29 @@ - + SequenceFlow_1maepy7 - + SequenceFlow_0sissul - + SequenceFlow_1oc7wcr SequenceFlow_0n42zi5 - + SequenceFlow_1eqfh23 SequenceFlow_0innva6 - + SequenceFlow_0n42zi5 SequenceFlow_1yy4aik - + SequenceFlow_1yy4aik SequenceFlow_1h9kkhb - + SequenceFlow_0innva6 SequenceFlow_0sissul @@ -64,13 +64,13 @@ - + - + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateNetworkCollectionBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateNetworkCollectionBB.bpmn index c6c3599449..fb2bfae01a 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateNetworkCollectionBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateNetworkCollectionBB.bpmn @@ -1,10 +1,10 @@ - + - + SequenceFlow_1maepy7 - + SequenceFlow_0hhklb4 @@ -12,22 +12,22 @@ SequenceFlow_06rq9pi - + SequenceFlow_06rq9pi SequenceFlow_05yxpu5 - + SequenceFlow_05yxpu5 SequenceFlow_0z4c30j - + SequenceFlow_0z4c30j SequenceFlow_1hij1px - + SequenceFlow_1hij1px SequenceFlow_0hhklb4 @@ -41,13 +41,13 @@ - + - + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateVfModuleBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateVfModuleBB.bpmn index bd24eeaed7..bd126de24e 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateVfModuleBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateVfModuleBB.bpmn @@ -1,15 +1,15 @@ - + - + SequenceFlow_1xr6chl - + SequenceFlow_1s4rpyp SequenceFlow_15hn8si - + SequenceFlow_1stomxq @@ -18,7 +18,7 @@ - + SequenceFlow_1xr6chl SequenceFlow_1s4rpyp @@ -35,97 +35,130 @@ SequenceFlow_0ecr393 - + SequenceFlow_0qqsilv SequenceFlow_1stomxq - + SequenceFlow_0ecr393 SequenceFlow_0qqsilv + + + SequenceFlow_0gcots6 + + + + SequenceFlow_0gcots6 + + + + - + - + - + - - + + - + - + - + - + - - + + - + - - + + - + - + - - + + - + - - + + - + - + - - + + - + - + - - + + - + - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateVolumeGroupBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateVolumeGroupBB.bpmn index ffe74d1295..747265c2cf 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateVolumeGroupBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateVolumeGroupBB.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_1wz1rfg @@ -8,17 +8,17 @@ SequenceFlow_0mh0v9h - + SequenceFlow_06q6g74 SequenceFlow_0kfkpbh - + SequenceFlow_1d5nux2 SequenceFlow_0mh0v9h - + SequenceFlow_1wz1rfg SequenceFlow_06q6g74 @@ -35,10 +35,21 @@ - + SequenceFlow_06flg6h SequenceFlow_1d5nux2 + + + SequenceFlow_1wtq4y7 + + + + SequenceFlow_1wtq4y7 + + + + @@ -113,6 +124,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeactivateNetworkBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeactivateNetworkBB.bpmn index 836f52b9be..5c85d17403 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeactivateNetworkBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeactivateNetworkBB.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_05elmhj @@ -7,11 +7,11 @@ SequenceFlow_18atf08 - + SequenceFlow_05elmhj SequenceFlow_0xbvwsu - + SequenceFlow_0xbvwsu SequenceFlow_18atf08 @@ -25,46 +25,46 @@ - + - + - + - + - + - + - - + + - + - - - - + + + + - + - - - - + + + + - + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeactivateServiceInstanceBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeactivateServiceInstanceBB.bpmn index 80faf1378c..5284788b89 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeactivateServiceInstanceBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeactivateServiceInstanceBB.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_101w1ck @@ -9,11 +9,11 @@ - + SequenceFlow_00q7fsg SequenceFlow_0pioehv - + SequenceFlow_101w1ck SequenceFlow_00q7fsg diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeactivateVfModuleBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeactivateVfModuleBB.bpmn index 85cde2aca7..f30a1f18ce 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeactivateVfModuleBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeactivateVfModuleBB.bpmn @@ -1,15 +1,15 @@ - + SequenceFlow_0m379r2 - + SequenceFlow_0m379r2 SequenceFlow_01bdpek - + SequenceFlow_01bdpek SequenceFlow_1y1c7fh diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeactivateVnfBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeactivateVnfBB.bpmn index d6b7dd6534..790cab1737 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeactivateVnfBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeactivateVnfBB.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_0k9qnoi @@ -10,11 +10,11 @@ SequenceFlow_0vnitwg - + SequenceFlow_0k9qnoi SequenceFlow_0r6pzwt - + SequenceFlow_0r6pzwt SequenceFlow_0vnitwg diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeactivateVolumeGroupBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeactivateVolumeGroupBB.bpmn index 2b2e30b773..63a01d6573 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeactivateVolumeGroupBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeactivateVolumeGroupBB.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_1wz1rfg @@ -8,7 +8,7 @@ SequenceFlow_0mh0v9h - + SequenceFlow_1wz1rfg SequenceFlow_0mh0v9h diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteNetworkBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteNetworkBB.bpmn index faa40600a5..95e481db4f 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteNetworkBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteNetworkBB.bpmn @@ -1,20 +1,20 @@ - + - + SequenceFlow_1mc3d3f - + SequenceFlow_1c906im SequenceFlow_0nhd7b7 - + SequenceFlow_1mc3d3f SequenceFlow_1c906im - + SequenceFlow_0nhd7b7 @@ -38,24 +38,24 @@ - + - + - + - - + + - + - + @@ -64,10 +64,10 @@ - + - + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteVfModuleBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteVfModuleBB.bpmn index 832a96cae7..5795c1c671 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteVfModuleBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteVfModuleBB.bpmn @@ -1,7 +1,7 @@ - + - + SequenceFlow_1537yw5 @@ -9,12 +9,12 @@ SequenceFlow_08tvhtf - + SequenceFlow_02lpx87 SequenceFlow_1mxrfqv - + SequenceFlow_1mxrfqv @@ -30,6 +30,17 @@ SequenceFlow_02lpx87 + + + SequenceFlow_0h607z0 + + + + SequenceFlow_0h607z0 + + + + @@ -82,6 +93,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteVolumeGroupBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteVolumeGroupBB.bpmn index 97ac11373e..f2bd2246e4 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteVolumeGroupBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteVolumeGroupBB.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_1wz1rfg @@ -8,7 +8,7 @@ SequenceFlow_0mh0v9h - + SequenceFlow_0fkan8t SequenceFlow_0mh0v9h @@ -33,6 +33,16 @@ SequenceFlow_13ngwev SequenceFlow_0fkan8t + + + SequenceFlow_07rsz9o + + + SequenceFlow_07rsz9o + + + + @@ -87,6 +97,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ExecuteBuildingBlock.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ExecuteBuildingBlock.bpmn index 8640f7e069..01d88b91dc 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ExecuteBuildingBlock.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ExecuteBuildingBlock.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_0rq4c5r @@ -38,271 +38,240 @@ SequenceFlow_1ryv9sh - - SequenceFlow_0yeaaxu - - - - SequenceFlow_0yeaaxu - SequenceFlow_1b5op07 - SequenceFlow_030qtgc - SequenceFlow_0a62t4c - - - SequenceFlow_0h8v45y - SequenceFlow_1db2c7t - - - SequenceFlow_0a62t4c - SequenceFlow_0fwsjva - SequenceFlow_0h8v45y - - - SequenceFlow_0ndt8ft - SequenceFlow_07a1ytc - - - - - - SequenceFlow_0fwsjva - SequenceFlow_1wbevp0 - SequenceFlow_1db2c7t - - - SequenceFlow_07a1ytc - - - SequenceFlow_1wbevp0 - SequenceFlow_0ndt8ft - - - - - - - - - - - - - - - - - SequenceFlow_030qtgc - - - - SequenceFlow_1b5op07 - - + + + SequenceFlow_09synl9 + + + + + SequenceFlow_09synl9 + SequenceFlow_0a62t4c + + + SequenceFlow_1db2c7t + + + SequenceFlow_0a62t4c + SequenceFlow_0fwsjva + SequenceFlow_0h8v45y + + + SequenceFlow_0ndt8ft + SequenceFlow_07a1ytc + + + + + + SequenceFlow_0fwsjva + SequenceFlow_1wbevp0 + SequenceFlow_1db2c7t + + + SequenceFlow_1wbevp0 + SequenceFlow_0ndt8ft + + + + + + + + + + + + + + SequenceFlow_0h8v45y + + + SequenceFlow_07a1ytc + + + - + - + - + - - + + - + - - + + - + - + - + - + - - + + - + - + - + - + - + - + - + - - + + - + - - + + - + - - - + + - + - + - + - - - - - - - + - - - - + + - + - - + + - + - - + + - + - + - - + + - + - + - - - - + + + + - + - + - + - - + + - + - - - - - - - - - - - - - - - - - + + - + - - - - + + + + + - + - - - - - + + + + - + - - + + - + - - + + - + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UnassignNetworkBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UnassignNetworkBB.bpmn index fb250fc03f..fdae49fdda 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UnassignNetworkBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UnassignNetworkBB.bpmn @@ -4,7 +4,7 @@ SequenceFlow_0zaz9o2 - + SequenceFlow_0le4vrj SequenceFlow_1ks8kmt @@ -14,7 +14,7 @@ - + SequenceFlow_1ks8kmt SequenceFlow_0csh9dc diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UnassignServiceInstanceBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UnassignServiceInstanceBB.bpmn index 235c7c9eac..f077c78348 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UnassignServiceInstanceBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UnassignServiceInstanceBB.bpmn @@ -1,20 +1,20 @@ - + - + SequenceFlow_0fzrhkc - + SequenceFlow_0pu9j6i SequenceFlow_0sfeg65 - + SequenceFlow_0fzrhkc SequenceFlow_0pu9j6i - + SequenceFlow_0sfeg65 @@ -24,9 +24,9 @@ - + - + @@ -34,9 +34,9 @@ - + - + @@ -50,16 +50,16 @@ - + - + - + - + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UnassignVfModuleBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UnassignVfModuleBB.bpmn index 2b9edbc3d5..0f3138121e 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UnassignVfModuleBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UnassignVfModuleBB.bpmn @@ -1,18 +1,18 @@ - + - + SequenceFlow_1kfxl04 - + SequenceFlow_1p2r4og SequenceFlow_0qa6sxx - + SequenceFlow_1kfxl04 SequenceFlow_1p2r4og - + SequenceFlow_0qa6sxx @@ -24,14 +24,14 @@ - + - + - + @@ -41,23 +41,23 @@ - + - + - - + + - + - + - + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UnassignVnfBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UnassignVnfBB.bpmn index 83ba0a9155..4676acfa42 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UnassignVnfBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UnassignVnfBB.bpmn @@ -1,23 +1,23 @@ - + SequenceFlow_1kfxl04 - + SequenceFlow_0w3s09a SequenceFlow_0qa6sxx - + SequenceFlow_1kfxl04 SequenceFlow_02st1i1 - + SequenceFlow_0qa6sxx - + SequenceFlow_02st1i1 SequenceFlow_0w3s09a @@ -29,7 +29,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UnassignVolumeGroupBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UnassignVolumeGroupBB.bpmn index 12af246153..9947d1a1c5 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UnassignVolumeGroupBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UnassignVolumeGroupBB.bpmn @@ -1,10 +1,10 @@ - + SequenceFlow_1kfxl04 - + SequenceFlow_1kfxl04 SequenceFlow_0qa6sxx diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UpdateNetworkBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UpdateNetworkBB.bpmn index daf0358683..1cfb9a3860 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UpdateNetworkBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UpdateNetworkBB.bpmn @@ -56,17 +56,6 @@ SequenceFlow_0fhfitm - - - SequenceFlow_1vfwv05 - - - - SequenceFlow_1vfwv05 - - - - @@ -190,28 +179,6 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/VnfAdapter.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/VnfAdapter.bpmn index 04f3684ee4..30a95eb81f 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/VnfAdapter.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/VnfAdapter.bpmn @@ -1,7 +1,7 @@ - + SequenceFlow_1xr6chl @@ -15,7 +15,7 @@ - + SequenceFlow_1ivhukd -- cgit 1.2.3-korg