From 0bb644bd5c11ce03b6dec71d26127fbd3519a9b4 Mon Sep 17 00:00:00 2001 From: "Benjamin, Max (mb388a)" Date: Tue, 7 Aug 2018 16:06:09 -0400 Subject: Refactored references to AaiUtils to use AAIResourceClient updated bpmn, removed Generic AAI flows, and removed dead useless code Did not modify E2E Delete Service Instance flow as it has changed significantly Issue-ID: SO-813 Change-Id: I1a6bc5353ef89e2ce4359be2654395f7ce060aba Signed-off-by: Benjamin, Max (mb388a) --- .../process/DeleteVcpeResCustService.bpmn | 45 +--- .../process/UpdateCustomE2EServiceInstance.bpmn | 60 ++--- .../DoCompareModelofE2EServiceInstance.bpmn | 78 +++---- .../subprocess/DoCreateAllottedResourceBRG.bpmn | 223 ++++--------------- .../subprocess/DoCreateAllottedResourceTXC.bpmn | 244 +++++---------------- .../subprocess/DoCreateE2ENetworkInstance.bpmn | 41 +--- .../subprocess/DoCreateE2EServiceInstance.bpmn | 58 +---- .../subprocess/DoCreateE2EServiceInstanceV2.bpmn | 54 +---- .../subprocess/DoCreateNetworkInstance.bpmn | 78 ++----- .../subprocess/DoCreateServiceInstance.bpmn | 144 ++---------- .../subprocess/DoCreateVfModuleVolumeV2.bpmn | 40 +--- .../src/main/resources/subprocess/DoCreateVnf.bpmn | 116 +++------- .../DoCustomDeleteE2EServiceInstance.bpmn | 54 +---- .../DoCustomDeleteE2EServiceInstanceV2.bpmn | 47 +--- .../subprocess/DoDeleteServiceInstance.bpmn | 34 +-- .../subprocess/DoUpdateE2EServiceInstance.bpmn | 74 +------ .../DoUpdateE2EServiceInstanceRollback.bpmn | 70 +----- .../subprocess/DoUpdateNetworkInstance.bpmn | 78 ++----- 18 files changed, 281 insertions(+), 1257 deletions(-) (limited to 'bpmn/so-bpmn-infrastructure-flows/src/main/resources') diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteVcpeResCustService.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteVcpeResCustService.bpmn index a835946d1d..0d287ebca4 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteVcpeResCustService.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteVcpeResCustService.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_7 @@ -138,26 +138,12 @@ DeleteVcpeResCustService.prepareFalloutRequest(execution)]]> SequenceFlow_04ao07f - - - - - - - - - - - + SequenceFlow_0jek18q - SequenceFlow_1ttswdr - - - SequenceFlow_1ttswdr SequenceFlow_18103ca +DeleteVcpeResCustService.getServiceInstance(execution)]]> SequenceFlow_0jek18q @@ -167,10 +153,9 @@ DeleteVcpeResCustService.prepareServiceDelete(execution)]]> SequenceFlow_18103ca - + - @@ -508,11 +493,8 @@ DeleteVcpeResCustService.validateVnfDelete(execution)]]> - - - - + @@ -528,16 +510,16 @@ DeleteVcpeResCustService.validateVnfDelete(execution)]]> - + - + - + - + @@ -547,15 +529,6 @@ DeleteVcpeResCustService.validateVnfDelete(execution)]]> - - - - - - - - - diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateCustomE2EServiceInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateCustomE2EServiceInstance.bpmn index 28bd3f76ea..1be30d62e4 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateCustomE2EServiceInstance.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateCustomE2EServiceInstance.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_0s2spoq @@ -176,29 +176,13 @@ csi.sendSyncResponse(execution)]]> - - - - - - - - - - - - + SequenceFlow_0az1n4y - SequenceFlow_1bd4711 - - - SequenceFlow_1bd4711 SequenceFlow_03i6zhx +dcsi.getServiceInstance(execution)]]> - SequenceFlow_0xhbobd SequenceFlow_0t7zinj @@ -237,7 +221,7 @@ ddsi.preCompareModelVersions(execution)]]> SequenceFlow_0zmd4rt SequenceFlow_1n8h3zt - + SequenceFlow_04qwbbf @@ -354,7 +338,7 @@ ddsi.preUpdateServiceOperationStatus(execution)]]> - + @@ -382,9 +366,9 @@ ddsi.preUpdateServiceOperationStatus(execution)]]> - + - + @@ -500,40 +484,30 @@ ddsi.preUpdateServiceOperationStatus(execution)]]> - - - - + - - - - - - - - + - - + + - + - + - + @@ -550,10 +524,10 @@ ddsi.preUpdateServiceOperationStatus(execution)]]> - - + + - + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCompareModelofE2EServiceInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCompareModelofE2EServiceInstance.bpmn index c04c2d97ea..73d3687bfa 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCompareModelofE2EServiceInstance.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCompareModelofE2EServiceInstance.bpmn @@ -1,5 +1,5 @@ - + @@ -70,30 +70,14 @@ def dcsi = new DoCompareModelofE2EServiceInstance() dcsi.preProcessRequest(execution) ]]> - - - - - - - - - - - - + SequenceFlow_1xzphe4 - SequenceFlow_0b6eqin - - - SequenceFlow_0b6eqin SequenceFlow_1cpg3ku +dcsi.getServiceInstance(execution)]]> - - + @@ -102,9 +86,9 @@ dcsi.postProcessAAIGET(execution)]]> - + - + @@ -114,16 +98,16 @@ dcsi.postProcessAAIGET(execution)]]> - + - + - - + + - + @@ -165,9 +149,9 @@ dcsi.postProcessAAIGET(execution)]]> - + - + @@ -178,48 +162,36 @@ dcsi.postProcessAAIGET(execution)]]> - + - + - - + + - + - - - - + - - - - - - - - - + + - + - - - - + + - + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateAllottedResourceBRG.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateAllottedResourceBRG.bpmn index d7bd54cc4e..6f1609c566 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateAllottedResourceBRG.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateAllottedResourceBRG.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_1 @@ -13,49 +13,16 @@ DoCreateAllottedResourceBRG dcar = new DoCreateAllottedResourceBRG() dcar.preProcessRequest(execution)]]> - - notFound - SequenceFlow_6 - - - - - - - - - - - - - - - SequenceFlow_2 - SequenceFlow_4 - - - - SequenceFlow_4 - notFound - found - - - found + SequenceFlow_1a2mcyk SequenceFlow_0gbsa12 - - SequenceFlow_6 - - - SequenceFlow_17p4ohs + SequenceFlow_1vg5rfa SequenceFlow_11 - - - - - - - - - - - - SequenceFlow_1m8u8dl - SequenceFlow_1vg5rfa - - - - SequenceFlow_1vg5rfa - SequenceFlow_17p4ohs - SequenceFlow_0f7u5pu - - - - - - SequenceFlow_0f7u5pu - SequenceFlow_16o7col - - - - SequenceFlow_16o7col - - - - + SequenceFlow_1h61pqs @@ -314,9 +243,6 @@ dcar.validateSDNCResp(execution, response, "get" )]]> SequenceFlow_11 - - - SequenceFlow_1iy3cqb @@ -334,6 +260,22 @@ dcar.generateOutputs(execution)]]> + + + SequenceFlow_2 + SequenceFlow_1a2mcyk + + + + SequenceFlow_1m8u8dl + SequenceFlow_1vg5rfa + + @@ -357,57 +299,16 @@ dcar.generateOutputs(execution)]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - + @@ -416,11 +317,10 @@ dcar.generateOutputs(execution)]]> - - - + + - + @@ -545,51 +445,12 @@ dcar.generateOutputs(execution)]]> - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -672,7 +533,7 @@ dcar.generateOutputs(execution)]]> - + @@ -698,18 +559,11 @@ dcar.generateOutputs(execution)]]> - + - + - - - - - - - @@ -750,6 +604,19 @@ dcar.generateOutputs(execution)]]> + + + + + + + + + + + + + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateAllottedResourceTXC.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateAllottedResourceTXC.bpmn index f26bae0b39..3deaae4e0d 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateAllottedResourceTXC.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateAllottedResourceTXC.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_1 @@ -12,50 +12,17 @@ DoCreateAllottedResourceTXC dcar = new DoCreateAllottedResourceTXC() dcar.preProcessRequest(execution)]]> - - - notFound - SequenceFlow_6 - - - - - - - - - - - - - - - SequenceFlow_2 - SequenceFlow_4 - - - - SequenceFlow_4 - notFound - found - - + - found + SequenceFlow_01zb7a0 SequenceFlow_0gbsa12 - - SequenceFlow_6 - - - SequenceFlow_17p4ohs + SequenceFlow_0vrw9a9 SequenceFlow_11 SequenceFlow_0q1hz2p - - - - - - - - - - - - SequenceFlow_1m8u8dl - SequenceFlow_1vg5rfa - - - - SequenceFlow_1vg5rfa - SequenceFlow_17p4ohs - SequenceFlow_0f7u5pu - - - - - - SequenceFlow_0f7u5pu - SequenceFlow_16o7col - - - - SequenceFlow_16o7col - - - - SequenceFlow_1h61pqs @@ -300,7 +228,7 @@ dcar.validateSDNCResp(execution, response, "get" )]]> SequenceFlow_1m8u8dl SequenceFlow_0z8luou - + @@ -313,9 +241,6 @@ dcar.validateSDNCResp(execution, response, "get" )]]> SequenceFlow_11 - - - SequenceFlow_1iy3cqb @@ -334,6 +259,23 @@ dcar.generateOutputs(execution)]]> + + SequenceFlow_2 + SequenceFlow_01zb7a0 + + + + SequenceFlow_1m8u8dl + SequenceFlow_0vrw9a9 + + + + @@ -357,57 +299,16 @@ dcar.generateOutputs(execution)]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - + - + @@ -416,11 +317,10 @@ dcar.generateOutputs(execution)]]> - - - + + - + @@ -538,53 +438,6 @@ dcar.generateOutputs(execution)]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -663,9 +516,9 @@ dcar.generateOutputs(execution)]]> - + - + @@ -691,23 +544,16 @@ dcar.generateOutputs(execution)]]> - + - + - - - - - - - - + - + @@ -750,6 +596,26 @@ dcar.generateOutputs(execution)]]> + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateE2ENetworkInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateE2ENetworkInstance.bpmn index 07de3fc0b1..3fea7467c5 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateE2ENetworkInstance.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateE2ENetworkInstance.bpmn @@ -33,32 +33,17 @@ dcsi.postProcessSDNCAssign(execution)]]> SequenceFlow_0o6bjmn - - - - - - - - - - - + SequenceFlow_0k06cqp - SequenceFlow_1oql7zl - - - SequenceFlow_1oql7zl SequenceFlow_0o6bjmn +dcsi.getServiceInstance(execution)]]> - + - @@ -81,9 +66,6 @@ dcsi.postProcessAAIGET2(execution)]]> - - - @@ -102,26 +84,17 @@ dcsi.postProcessAAIGET2(execution)]]> - - - + + - + - - - - - - - - - + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn index a5fadcf14b..eeaa5e451a 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn @@ -12,21 +12,6 @@ def dcsi = new DoCreateE2EServiceInstance() dcsi.preProcessRequest(execution) ]]> - - - - - - - - - - - - - SequenceFlow_1i7t9hq - SequenceFlow_4 - @@ -38,7 +23,7 @@ dcsi.preProcessRequest(execution) - SequenceFlow_1w01tqs + SequenceFlow_1i7t9hq SequenceFlow_129ih1g @@ -82,14 +67,6 @@ dcsi.postProcessRollback(execution) - - SequenceFlow_4 - SequenceFlow_1w01tqs - - - SequenceFlow_129ih1g SequenceFlow_1tkgqu3 @@ -179,7 +156,7 @@ dcsi.prepareDecomposeService(execution)]]> SequenceFlow_1i7t9hq - + SequenceFlow_1hbesp9 @@ -258,18 +235,6 @@ dcsi.doServicePreOperation(execution)]]> - - - - - - - - - - - - @@ -314,18 +279,6 @@ dcsi.doServicePreOperation(execution)]]> - - - - - - - - - - - - @@ -451,9 +404,12 @@ dcsi.doServicePreOperation(execution)]]> - + + + + - + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateE2EServiceInstanceV2.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateE2EServiceInstanceV2.bpmn index 4c107c7cb4..77c62e573d 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateE2EServiceInstanceV2.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateE2EServiceInstanceV2.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_1 @@ -13,21 +13,7 @@ def dcsi = new DoCreateE2EServiceInstanceV2() dcsi.preProcessRequest(execution) ]]> - - - - - - - - - - - - - SequenceFlow_2 - SequenceFlow_4 - + @@ -83,13 +69,6 @@ dcsi.postProcessRollback(execution) - - SequenceFlow_4 - SequenceFlow_10aubhh - - SequenceFlow_129ih1g SequenceFlow_03fabby @@ -225,9 +204,8 @@ def csi = new DoCreateE2EServiceInstanceV2() csi.postOtherControllerType(execution)]]> - - SequenceFlow_10aubhh + SequenceFlow_2 @@ -486,23 +464,13 @@ ddsi.preUpdateServiceOperationStatus(execution)]]> - - - - - - - - + - + - + - - - @@ -545,9 +513,6 @@ ddsi.preUpdateServiceOperationStatus(execution)]]> - - - @@ -752,13 +717,6 @@ ddsi.preUpdateServiceOperationStatus(execution)]]> - - - - - - - diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn index 12dbfe6dde..2f5fa39dbc 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_1n61wit @@ -332,19 +332,6 @@ DoCreateNetworkInstance.processJavaException(execution)]]> SequenceFlow_14 - - - - - - - - - - - SequenceFlow_0ftylq3 - SequenceFlow_3 - isNameSentYes_SequenceFlow SequenceFlow_6 @@ -353,23 +340,7 @@ def DoCreateNetworkInstance = new DoCreateNetworkInstance() DoCreateNetworkInstance.callRESTQueryAAINetworkName(execution)]]> - - - SequenceFlow_3 - siFoundYes - siFoundNo - - - - - - - siFoundNo - - + SequenceFlow_16 SequenceFlow_15 @@ -413,7 +384,7 @@ DoCreateNetworkInstance.preProcessRequest(execution)]]> - siFoundYes + SequenceFlow_3 isNameSentYes_SequenceFlow isNameSentNo_SequenceFlow @@ -535,6 +506,13 @@ def DoCreateNetworkInstance = new DoCreateNetworkInstance() DoCreateNetworkInstance.postProcessResponse(execution)]]> + + SequenceFlow_0ftylq3 + SequenceFlow_3 + + @@ -898,37 +876,12 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]> - - - - - - - - - - + - - - - - - - + - - - - - - - - - - - + @@ -961,7 +914,7 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]> - + @@ -1358,6 +1311,9 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]> + + + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateServiceInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateServiceInstance.bpmn index 29116a67fc..2c6f5ee61d 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateServiceInstance.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateServiceInstance.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_1 @@ -12,7 +12,7 @@ def dcsi = new DoCreateServiceInstance() dcsi.getAAICustomerById(execution)]]> - + SequenceFlow_1 SequenceFlow_2 @@ -21,7 +21,6 @@ def dcsi = new DoCreateServiceInstance() dcsi.preProcessRequest(execution) ]]> - SequenceFlow_156ih25 SequenceFlow_14 @@ -49,24 +48,12 @@ dcsi.postProcessSDNCAssign(execution)]]> SequenceFlow_9 - SequenceFlow_01q6pl4 + SequenceFlow_10 - - - - - - - - - - - SequenceFlow_11fnnkb - SequenceFlow_4 - + @@ -78,19 +65,9 @@ dcsi.postProcessSDNCAssign(execution)]]> - SequenceFlow_1uw2p9a - SequenceFlow_1w01tqs + SequenceFlow_3 SequenceFlow_1jhzmzn - - SequenceFlow_3 - SequenceFlow_11fnnkb - SequenceFlow_1uw2p9a - - - - - SequenceFlow_0tgrn11 @@ -143,37 +120,6 @@ dcsi.postProcessRollback(execution) - - SequenceFlow_4 - SequenceFlow_1w01tqs - - - - - - - - - - - - - - - SequenceFlow_10 - SequenceFlow_0tx5frq - - - - - SequenceFlow_0tx5frq - SequenceFlow_01q6pl4 - - SequenceFlow_1jhzmzn SequenceFlow_16sdyz9 @@ -243,24 +189,18 @@ dcsi.processJavaException(execution)]]> - + + - + - + - + - - - - - - - @@ -292,39 +232,15 @@ dcsi.processJavaException(execution)]]> - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - @@ -385,18 +301,6 @@ dcsi.processJavaException(execution)]]> - - - - - - - - - - - - @@ -419,28 +323,6 @@ dcsi.processJavaException(execution)]]> - - - - - - - - - - - - - - - - - - - - - - diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleVolumeV2.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleVolumeV2.bpmn index ac48776c95..26a4112d59 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleVolumeV2.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleVolumeV2.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_1 @@ -128,26 +128,14 @@ doCreateVfModuleVolumeV2.executeMethod('validateVnfResponse', execution, isDebug - - - - - - - - + SequenceFlow_1wi1cf9 - SequenceFlow_1vmbvy8 - - - SequenceFlow_1vmbvy8 SequenceFlow_1dpt7ul +doCreateVfModuleVolumeV2.executeMethod('getServiceInstance', execution, isDebugLogEnabled)]]> - - + @@ -330,31 +318,21 @@ doCreateVfModuleVolumeV2.executeMethod('validateGetServiceInstanceCall', executi - - - - + - - - - - - - - + - + - + - + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVnf.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVnf.bpmn index dacce53963..a093beae91 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVnf.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVnf.bpmn @@ -13,39 +13,6 @@ DoCreateVnf createVnf = new DoCreateVnf() createVnf.preProcessRequest(execution)]]> - - notFound - SequenceFlow_6 - - - - - - - - - - - - - - - - SequenceFlow_2 - SequenceFlow_4 - - - - SequenceFlow_4 - notFound - found - - - - - SequenceFlow_7 vnfExistYes @@ -77,10 +44,6 @@ ExceptionUtil exceptionUtil = new ExceptionUtil() exceptionUtil.buildWorkflowException(execution, 5000, "Generic Vnf Already Exist.")]]> - - SequenceFlow_6 - - SequenceFlow_10 @@ -200,7 +163,7 @@ DoCreateVnf createVnf = new DoCreateVnf() createVnf.postProcessCreateGenericVnf(execution)]]> - found + SequenceFlow_1mvplyi VnfNameNotSpecified1 VnfNameSpecified1 @@ -271,6 +234,14 @@ createVnfInfra.validateSDNCResponse(execution, response, "get")]]> + + SequenceFlow_2 + SequenceFlow_1mvplyi + + + @@ -283,67 +254,20 @@ doCreateVnf.prepUpdateAAIGenericVnf(execution)]]> - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - + @@ -630,6 +554,16 @@ doCreateVnf.prepUpdateAAIGenericVnf(execution)]]> + + + + + + + + + + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn index 73c21090ea..2e12dd3b96 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn @@ -15,13 +15,6 @@ ddsi.preProcessRequest(execution) SequenceFlow_0e7inkl - - SequenceFlow_188ejvu - SequenceFlow_0vi0sv6 - - SequenceFlow_0oj2anh SequenceFlow_1ev7z6q @@ -49,9 +42,8 @@ ex.processJavaException(execution)]]> - + - SequenceFlow_1ubor5z SequenceFlow_1dza4q4 @@ -93,7 +85,7 @@ ddsi.preResourceDelete(execution, resourceName )]]> SequenceFlow_1ev7z6q - SequenceFlow_0vi0sv6 + SequenceFlow_11e6bfy SequenceFlow_1ym9otf SequenceFlow_1j08ko3 - - - - - - - - - - - - - SequenceFlow_11e6bfy - SequenceFlow_188ejvu - - SequenceFlow_1j08ko3 SequenceFlow_03c0zlq @@ -219,9 +195,6 @@ ddsi.parseNextResource(execution)]]> - - - @@ -237,9 +210,9 @@ ddsi.parseNextResource(execution)]]> - + - + @@ -249,13 +222,6 @@ ddsi.parseNextResource(execution)]]> - - - - - - - @@ -327,16 +293,6 @@ ddsi.parseNextResource(execution)]]> - - - - - - - - - - @@ -467,4 +423,4 @@ ddsi.parseNextResource(execution)]]> - \ No newline at end of file + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstanceV2.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstanceV2.bpmn index 3e76f61224..2df19abf68 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstanceV2.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstanceV2.bpmn @@ -15,12 +15,12 @@ ddsi.preProcessRequest(execution) SequenceFlow_06tonva - - SequenceFlow_188ejvu + + SequenceFlow_11e6bfy SequenceFlow_00a3ijv +ddsi.getServiceInstance(execution)]]> SequenceFlow_0t5f2dt @@ -48,7 +48,7 @@ ex.processJavaException(execution)]]> - + SequenceFlow_1931m8u @@ -122,22 +122,6 @@ ddsi.preSDNCResourceDelete(execution, resourceName )]]> SequenceFlow_0akcnw7 SequenceFlow_0uc2beq - - - - - - - - - - - - - SequenceFlow_11e6bfy - SequenceFlow_188ejvu - - SequenceFlow_1qzxy2i @@ -430,7 +414,7 @@ ddsi.preInitResourcesOperStatus(execution)]]> - + @@ -447,10 +431,9 @@ ddsi.preInitResourcesOperStatus(execution)]]> - - + - + @@ -553,16 +536,6 @@ ddsi.preInitResourcesOperStatus(execution)]]> - - - - - - - - - - @@ -781,10 +754,10 @@ ddsi.preInitResourcesOperStatus(execution)]]> - + - + @@ -925,4 +898,4 @@ ddsi.preInitResourcesOperStatus(execution)]]> - \ No newline at end of file + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteServiceInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteServiceInstance.bpmn index fae66a7381..d9a93e66d8 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteServiceInstance.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteServiceInstance.bpmn @@ -67,28 +67,14 @@ ddsi.preProcessSDNCDelete(execution)]]> - - - - - - - - - - + + SequenceFlow_1jqc16k - SequenceFlow_1grea1r - - - - SequenceFlow_1grea1r SequenceFlow_1up0j5r +ddsi.getServiceInstance(execution)]]> - SequenceFlow_0riudmc @@ -250,26 +236,16 @@ ddsi.postProcessSDNCDelete(execution, response, "delete")]]> - - - - + - + - - - - - - - diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateE2EServiceInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateE2EServiceInstance.bpmn index a46d8d4de2..ef3340e887 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateE2EServiceInstance.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateE2EServiceInstance.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_1 @@ -113,7 +113,7 @@ ddsi.postProcessAAIPUT(execution)]]> SequenceFlow_1demy08 - + SequenceFlow_0ku36oy @@ -173,40 +173,8 @@ dcsi.postProcessRollback(execution) - - SequenceFlow_1demy08 - SequenceFlow_1cy5gq2 - - - - - - - - - - - - - - - - SequenceFlow_1cy5gq2 - SequenceFlow_1vy856f - - - SequenceFlow_1vy856f - SequenceFlow_14ggluy - - - - - SequenceFlow_14ggluy + SequenceFlow_1demy08 SequenceFlow_1kx5ke9 - - - + - + @@ -504,36 +470,6 @@ dcsi.preProcessAAIPUT(execution)]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateE2EServiceInstanceRollback.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateE2EServiceInstanceRollback.bpmn index 1589633e59..b53e87d34a 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateE2EServiceInstanceRollback.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateE2EServiceInstanceRollback.bpmn @@ -184,7 +184,7 @@ csi.postProcessForAddResource(execution)]]> - SequenceFlow_1ixphei + SequenceFlow_1a65s3k SequenceFlow_1lppnhy def dcsi = new DoUpdateE2EServiceInstanceRollback() dcsi.postProcessAAIPUT(execution)]]> - + @@ -287,38 +287,6 @@ rbk.postProcessRequest(execution)]]> - - SequenceFlow_1a65s3k - SequenceFlow_0870pzc - - - - - - - - - - - - - - - SequenceFlow_0870pzc - SequenceFlow_1f31l5s - - - - SequenceFlow_1f31l5s - SequenceFlow_1ixphei - - - - @@ -602,9 +570,9 @@ dcsi.postProcessAAIGET(execution)]]> - + - + @@ -764,36 +732,6 @@ dcsi.postProcessAAIGET(execution)]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateNetworkInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateNetworkInstance.bpmn index 306b05cea1..b82b1da951 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateNetworkInstance.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateNetworkInstance.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_1 @@ -231,42 +231,14 @@ DoUpdateNetworkInstance.callRESTQueryAAICloudRegion(execution)]]> - siFoundYes + SequenceFlow_3 SequenceFlow_24 - - siFoundNo - - - - SequenceFlow_3 - siFoundYes - siFoundNo - - - - - - - - - - - - - - - - SequenceFlow_7 - SequenceFlow_3 - - + SequenceFlow_59 SequenceFlow_13 @@ -340,6 +312,13 @@ def DoUpdateNetworkInstance = new DoUpdateNetworkInstance() DoUpdateNetworkInstance.callRESTQueryAAINetworkPolicy(execution)]]> + + SequenceFlow_7 + SequenceFlow_3 + + @@ -430,7 +409,7 @@ DoUpdateNetworkInstance.callRESTQueryAAINetworkPolicy(execution)]]> - + @@ -682,42 +661,16 @@ DoUpdateNetworkInstance.callRESTQueryAAINetworkPolicy(execution)]]> - - - - - - - - - - + - - - - - - - + - - - - - - - - - - - - + @@ -824,6 +777,9 @@ DoUpdateNetworkInstance.callRESTQueryAAINetworkPolicy(execution)]]> + + + -- cgit 1.2.3-korg