From 6ba0a22bc952232d14d2d24c5f73a42aae2791a9 Mon Sep 17 00:00:00 2001 From: "Benjamin, Max (mb388a)" Date: Thu, 11 Oct 2018 13:55:37 -0400 Subject: Dynamic Cloud Owner Support added in cloud configuration object to request params Fix Bean scanning so it picks up the resttemplate removed unnecessary RestTemplate Bean configurations corrected typo in CloudConfiguration class updated gr api test cases with dynamic cloud owner updated groovy files to allow for dynamic cloud owner values updated GR API layer to include cloud owner added enum for default cloud owner add cloud owner variable to camunda in mapping removed references to att-aic from BBInputSetup updated aai schema dependency to 1.3.1 from 1.3.0 Fixed incorrect type AAIUri and updated logging in the method. use existing service instance id instead of generating Pass cloudOwner to process to propagate to subprocesses. NOTE: our aai-schema dependency is 1.3.1-SNAPSHOT to be compatible with the cloud owner changes here. The releaesed 1.3.0 version is NOT compatible. Change-Id: I43b46774b77981d1c8bfe7c7a79b9434889e62ae Issue-ID: SO-1128 Signed-off-by: Benjamin, Max (mb388a) Signed-off-by: Rob Daugherty --- .../resources/process/CreateNetworkInstance.bpmn | 1 + .../process/CreateVcpeResCustService.bpmn | 1 + .../process/CreateVcpeResCustServiceV2.bpmn | 1 + .../resources/process/CreateVfModuleInfra.bpmn | 1 + .../process/CreateVfModuleVolumeInfraV1.bpmn | 3 +- .../src/main/resources/process/CreateVnfInfra.bpmn | 1 + .../resources/process/DeleteNetworkInstance.bpmn | 1 + .../process/DeleteVcpeResCustService.bpmn | 1 + .../main/resources/process/ReplaceVnfInfra.bpmn | 1 + .../resources/process/UpdateNetworkInstance.bpmn | 1 + .../resources/process/UpdateVfModuleInfra.bpmn | 1 + .../resources/process/UpdateVfModuleInfraV2.bpmn | 1 + .../src/main/resources/process/UpdateVnfInfra.bpmn | 1 + .../subprocess/DoCreateE2EServiceInstance.bpmn | 369 +++++++++------------ .../subprocess/DoCreateE2EServiceInstanceV2.bpmn | 33 +- .../subprocess/DoCreateServiceInstance.bpmn | 118 +++---- .../resources/subprocess/DoCreateVfModule.bpmn | 32 +- .../src/main/resources/subprocess/DoCreateVnf.bpmn | 140 +------- .../subprocess/DoCreateVnfAndModules.bpmn | 3 + .../src/main/resources/subprocess/DoDeleteVnf.bpmn | 137 ++++---- .../subprocess/DoDeleteVnfAndModules.bpmn | 1 + .../subprocess/DoUpdateE2EServiceInstance.bpmn | 140 +++----- .../DoUpdateE2EServiceInstanceRollback.bpmn | 44 +-- .../subprocess/DoUpdateVnfAndModules.bpmn | 1 + .../VCPE/CreateVcpeResCustService/request.json | 1 + .../VCPE/DeleteVcpeResCustService/request.json | 1 + .../src/test/resources/application-test.yaml | 24 -- .../src/test/resources/application-test.yml | 47 --- 28 files changed, 358 insertions(+), 748 deletions(-) (limited to 'bpmn/so-bpmn-infrastructure-flows') diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateNetworkInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateNetworkInstance.bpmn index 9b21b9309f..b35aa80b83 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateNetworkInstance.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateNetworkInstance.bpmn @@ -30,6 +30,7 @@ networkMod.processJavaException(execution)]]> + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVcpeResCustService.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVcpeResCustService.bpmn index 3b49011c3e..7413e6df83 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVcpeResCustService.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVcpeResCustService.bpmn @@ -505,6 +505,7 @@ CreateVcpeResCustService.prepareCreateAllottedResourceBRG(execution)]]> + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVcpeResCustServiceV2.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVcpeResCustServiceV2.bpmn index 06c517c12d..bfbdc25f18 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVcpeResCustServiceV2.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVcpeResCustServiceV2.bpmn @@ -475,6 +475,7 @@ CreateVcpeResCustService.prepareCreateAllottedResourceTXC(execution)]]> + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVfModuleInfra.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVfModuleInfra.bpmn index eefc2ca12c..150d50232a 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVfModuleInfra.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVfModuleInfra.bpmn @@ -32,6 +32,7 @@ + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVfModuleVolumeInfraV1.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVfModuleVolumeInfraV1.bpmn index dcdcdc9d26..c1e60ba46b 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVfModuleVolumeInfraV1.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVfModuleVolumeInfraV1.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_1 @@ -154,6 +154,7 @@ createVfModuleVolumeInfraV1.executeMethod('buildWorkflowException', execution, 2 + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVnfInfra.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVnfInfra.bpmn index 6af8c2248e..d7d4561364 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVnfInfra.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVnfInfra.bpmn @@ -37,6 +37,7 @@ createVnf.sendSyncResponse(execution)]]> + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteNetworkInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteNetworkInstance.bpmn index a62e16525d..827dfb034d 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteNetworkInstance.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteNetworkInstance.bpmn @@ -30,6 +30,7 @@ networkMod.processJavaException(execution)]]> + 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 0d287ebca4..fd0d8ff27a 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 @@ -240,6 +240,7 @@ DeleteVcpeResCustService.getServiceInstance(execution)]]> + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/ReplaceVnfInfra.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/ReplaceVnfInfra.bpmn index 6a157eb7c0..25b4f5de7f 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/ReplaceVnfInfra.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/ReplaceVnfInfra.bpmn @@ -362,6 +362,7 @@ uvfm.prepDoCreateVnfAndModules(execution)]]> + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateNetworkInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateNetworkInstance.bpmn index e5236f92bf..50600bd49f 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateNetworkInstance.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateNetworkInstance.bpmn @@ -30,6 +30,7 @@ networkMod.processJavaException(execution) + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVfModuleInfra.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVfModuleInfra.bpmn index c35e7ece96..3c5fff2d24 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVfModuleInfra.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVfModuleInfra.bpmn @@ -122,6 +122,7 @@ uvfm.falloutHandlerPrep(execution, 'UPDVfModI_FalloutHandlerRequest') + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVfModuleInfraV2.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVfModuleInfraV2.bpmn index 1efb127e33..8d30679849 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVfModuleInfraV2.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVfModuleInfraV2.bpmn @@ -164,6 +164,7 @@ uvfm.vfFlagSet(execution)]]> + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVnfInfra.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVnfInfra.bpmn index e50eb7f805..71fc966233 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVnfInfra.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVnfInfra.bpmn @@ -142,6 +142,7 @@ uvfm.postProcessRollback(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 9cf21ddc52..01040ba914 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 @@ -1,5 +1,5 @@ - + SequenceFlow_1qiiycn @@ -12,21 +12,6 @@ def dcsi = new DoCreateE2EServiceInstance() dcsi.preProcessRequest(execution) ]]> - - - - - - - - - - - - SequenceFlow_1i7t9hq - SequenceFlow_129ih1g - - SequenceFlow_0tgrn11 @@ -67,51 +52,17 @@ dcsi.postProcessRollback(execution) - - SequenceFlow_129ih1g + + SequenceFlow_012h7yx SequenceFlow_1tkgqu3 +ddsi.createServiceInstance(execution)]]> - - - SequenceFlow_1e5j351 - SequenceFlow_1qctzm0 - - - - - - - ${CVFMI_dbAdapterEndpoint} - - - application/soap+xml - Basic QlBFTENsaWVudDpwYXNzd29yZDEk - - - ${CVFMI_initResOperStatusRequest} - POST - ${statusCode} - ${response} - - http-connector - - - SequenceFlow_1qctzm0 - SequenceFlow_1s5aas9 - SequenceFlow_0w9t6tc - - SequenceFlow_012h7yx - - SequenceFlow_0xjwb45 SequenceFlow_012h7yx @@ -152,17 +103,41 @@ dcsi.prepareDecomposeService(execution)]]> - - SequenceFlow_1i7t9hq - - - - SequenceFlow_1hbesp9 + SequenceFlow_0yuzaen - - + + + SequenceFlow_1y9rkfr + SequenceFlow_0n7nbx3 + + + + + + + ${CVFMI_dbAdapterEndpoint} + + + application/soap+xml + Basic QlBFTENsaWVudDpwYXNzd29yZDEk + + + ${CVFMI_initResOperStatusRequest} + POST + ${statusCode} + ${response} + + http-connector + + + SequenceFlow_0n7nbx3 + SequenceFlow_0ckto7v + + @@ -180,71 +155,62 @@ dcsi.prepareDecomposeService(execution)]]> - SequenceFlow_0bf6bzp - SequenceFlow_0d0c20n + SequenceFlow_0b1dsaj + SequenceFlow_0sphcy5 - - SequenceFlow_0p6ba92 - SequenceFlow_0bf6bzp + + SequenceFlow_022onug + SequenceFlow_0b1dsaj - - SequenceFlow_0d0c20n - SequenceFlow_0a6vgsu + + SequenceFlow_0sphcy5 + SequenceFlow_18gnns6 - - - - SequenceFlow_0a6vgsu + + SequenceFlow_18gnns6 - - - - SequenceFlow_1hbesp9 - SequenceFlow_1e5j351 + + SequenceFlow_0yuzaen + SequenceFlow_1y9rkfr - - SequenceFlow_1s5aas9 - SequenceFlow_0p6ba92 + + SequenceFlow_0ckto7v + SequenceFlow_022onug - - - + + + + + + + + - + - + - - - - + - - - - - - - @@ -278,7 +244,7 @@ dcsi.doTPResourcesAllocation(execution)]]> - + @@ -302,109 +268,77 @@ dcsi.doTPResourcesAllocation(execution)]]> - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - + - + - - + + + + - + - - - - + + + + - - - - - - - - - - - - - - - - + @@ -413,83 +347,98 @@ dcsi.doTPResourcesAllocation(execution)]]> - - - + + + + + - + - - + + + + + - - + + - - + + - - - + + + + + - + + + + + + + + + + + + + + - - - + + + - + - - + + + - + - - - - + + + + - + - - - + + + - + - - - - - - - - - + + + - + - - - + + + - + - - - + + + - + - + \ No newline at end of file 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 77c62e573d..c699f911d0 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 @@ -14,21 +14,6 @@ dcsi.preProcessRequest(execution) ]]> - - - - - - - - - - - - SequenceFlow_0zmz5am - SequenceFlow_129ih1g - - SequenceFlow_0tgrn11 @@ -70,7 +55,7 @@ dcsi.postProcessRollback(execution) - SequenceFlow_129ih1g + SequenceFlow_0zmz5am SequenceFlow_03fabby SequenceFlow_0zmz5am - + SequenceFlow_1rhn48b @@ -471,16 +456,6 @@ ddsi.preUpdateServiceOperationStatus(execution)]]> - - - - - - - - - - @@ -731,9 +706,9 @@ ddsi.preUpdateServiceOperationStatus(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 2c6f5ee61d..e3f1d7721d 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,6 +1,6 @@ - + SequenceFlow_1 @@ -12,7 +12,7 @@ def dcsi = new DoCreateServiceInstance() dcsi.getAAICustomerById(execution)]]> - + SequenceFlow_1 SequenceFlow_2 @@ -54,20 +54,6 @@ dcsi.postProcessSDNCAssign(execution)]]> - - - - - - - - - - - - SequenceFlow_3 - SequenceFlow_1jhzmzn - SequenceFlow_0tgrn11 @@ -120,12 +106,12 @@ dcsi.postProcessRollback(execution) - - SequenceFlow_1jhzmzn + + SequenceFlow_3 SequenceFlow_16sdyz9 +ddsi.putServiceInstance(execution)]]> @@ -142,7 +128,6 @@ dcsi.createProject(execution)]]> def dcsi = new DoCreateServiceInstance() dcsi.createOwningEntity(execution)]]> - @@ -189,26 +174,25 @@ dcsi.processJavaException(execution)]]> - - + - + - + - + - + - + - + @@ -218,29 +202,30 @@ dcsi.processJavaException(execution)]]> - - + + - + - - + + + + - + - - + + + + - + - - - @@ -274,31 +259,29 @@ dcsi.processJavaException(execution)]]> - + - + - - + + - + - + - + - - - - + + - + @@ -324,40 +307,33 @@ dcsi.processJavaException(execution)]]> - + - - + + - + - + - + - - - - - - - - - + + - + - - + + - + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModule.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModule.bpmn index 820d1174be..c16061edb2 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModule.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModule.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_1 @@ -400,13 +400,13 @@ doCreateVfModule.prepUpdateAAIGenericVnf(execution)]]> SequenceFlow_112los9 - + - SequenceFlow_0d00zqi + SequenceFlow_0m382su SequenceFlow_0g270u0 - - - - - - - - - - SequenceFlow_0m382su - SequenceFlow_0d00zqi - SequenceFlow_1y1ttqe @@ -1248,9 +1236,9 @@ doCreateVfModule.preProcessUpdateAAIVfModuleRequestStatus(execution, 'Assigned') - + - + @@ -1276,13 +1264,6 @@ doCreateVfModule.preProcessUpdateAAIVfModuleRequestStatus(execution, 'Assigned') - - - - - - - @@ -1292,9 +1273,6 @@ doCreateVfModule.preProcessUpdateAAIVfModuleRequestStatus(execution, 'Assigned') - - - 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 a093beae91..50436352ea 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,44 +13,8 @@ DoCreateVnf createVnf = new DoCreateVnf() createVnf.preProcessRequest(execution)]]> - - SequenceFlow_7 - vnfExistYes - vnfExistNo - - - - - - - - - - - - - - - - VnfNameSpecified1 - SequenceFlow_7 - - - - vnfExistYes - SequenceFlow_10 - - - - - SequenceFlow_10 - - - vnfExistNo - VnfNameNotSpecified1 + SequenceFlow_11b2sf3 SequenceFlow_11 - - SequenceFlow_1mvplyi - VnfNameNotSpecified1 - VnfNameSpecified1 - - - - - @@ -236,12 +191,12 @@ doCreateVnf.prepUpdateAAIGenericVnf(execution)]]> SequenceFlow_2 - SequenceFlow_1mvplyi + SequenceFlow_11b2sf3 - + @@ -265,62 +220,14 @@ createVnf.getServiceInstance(execution)]]> - - - - - - - - - - + - - - - - - - - + - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -328,10 +235,10 @@ createVnf.getServiceInstance(execution)]]> - + - + @@ -454,27 +361,6 @@ createVnf.getServiceInstance(execution)]]> - - - - - - - - - - - - - - - - - - - - - @@ -555,13 +441,13 @@ createVnf.getServiceInstance(execution)]]> - + - - - + + + - + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn index 0d48719c6b..b5988538e3 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn @@ -36,6 +36,7 @@ doCreateVnfAndModules.preProcessRequest(execution)]]> + @@ -71,6 +72,7 @@ doCreateVnfAndModules.preProcessRequest(execution)]]> + @@ -123,6 +125,7 @@ doCreateVnfAndModules.validateAddOnModule(execution)]]> + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVnf.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVnf.bpmn index d9596f0d14..da7fc652ed 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVnf.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVnf.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_1 @@ -12,44 +12,29 @@ DoDeleteVnf deleteVnf = new DoDeleteVnf() deleteVnf.preProcessRequest(execution)]]> - - - - - - - - - - - - SequenceFlow_2 - SequenceFlow_5 - - + - SequenceFlow_5 + SequenceFlow_0hbmag5 vnfFound notFound - - + + - - vnfFound - SequenceFlow_4 + + SequenceFlow_2 + SequenceFlow_0hbmag5 +deleteVnf.getVnf(execution)]]> - notFound - SequenceFlow_4 + vnfFound inUse notInUse @@ -110,6 +95,7 @@ exceptionUtil.processJavaException(execution)]]> DoDeleteVnf delete = new DoDeleteVnf() delete.deleteVnf(execution)]]> + @@ -133,67 +119,50 @@ delete.deleteVnf(execution)]]> - + - + - - - - + - + - + - - - - - - - - - - - - - - - + - - - + + + - + - - - + + + - + - + - + - - + + - + @@ -202,12 +171,12 @@ delete.deleteVnf(execution)]]> - + - + - + @@ -225,42 +194,42 @@ delete.deleteVnf(execution)]]> - + - + - + - + - - + + - + - - + + - + - + - + - - + + - + @@ -296,8 +265,16 @@ delete.deleteVnf(execution)]]> - + + + + + + + + + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn index 4d6d0006e3..7563c05e1f 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn @@ -193,6 +193,7 @@ ddvam.validateSDNCResponse(execution, response, "unassign")]]> + 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 ef3340e887..8383ccbd1f 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 @@ -87,59 +87,33 @@ ddsi.preInitResourcesOperStatus(execution)]]> SequenceFlow_177wo8z - - - - - - - - - - - - + SequenceFlow_1kx5ke9 - SequenceFlow_0f76thv - - - SequenceFlow_0f76thv - SequenceFlow_0x0mhlj + SequenceFlow_1cur6kz +ddsi.updateServiceInstance(execution)]]> SequenceFlow_1demy08 - - SequenceFlow_0ku36oy + SequenceFlow_1cur6kz SequenceFlow_07aa121 - - SequenceFlow_0ku36oy - - SequenceFlow_07aa121 - SequenceFlow_1uu6uiu - - SequenceFlow_0x0mhlj - - - SequenceFlow_1muxopq @@ -180,7 +154,7 @@ dcsi.postProcessRollback(execution) def dcsi = new DoUpdateE2EServiceInstance() dcsi.preProcessAAIPUT(execution)]]> - + SequenceFlow_0yztz2p @@ -245,6 +219,7 @@ dcsi.preProcessAAIPUT(execution)]]> + @@ -341,11 +316,8 @@ dcsi.preProcessAAIPUT(execution)]]> - - - - + @@ -355,45 +327,27 @@ dcsi.preProcessAAIPUT(execution)]]> - + - - - - - - - - + - - - - - - - + - + - + - - - - - - - - - + + + + - + @@ -402,19 +356,6 @@ dcsi.preProcessAAIPUT(execution)]]> - - - - - - - - - - - - - @@ -429,55 +370,55 @@ dcsi.preProcessAAIPUT(execution)]]> - + - + - + - + - + - + - + - - + + - + - - + + - + - - + + - + - + - - + + - + @@ -579,6 +520,13 @@ 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 b53e87d34a..23233abc03 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 @@ -190,31 +190,15 @@ csi.postProcessForAddResource(execution)]]> def dcsi = new DoUpdateE2EServiceInstanceRollback() dcsi.preProcessAAIPUT(execution)]]> - - - - - - - - - - - - + SequenceFlow_1lppnhy - SequenceFlow_0kbisn8 - - - SequenceFlow_0kbisn8 SequenceFlow_1azhgda +dcsi.updateServiceInstance(execution)]]> - - + rollback AAI SequenceFlow_08p4pkv @@ -562,11 +546,8 @@ rbk.postProcessRequest(execution)]]> - - - - + @@ -577,18 +558,9 @@ rbk.postProcessRequest(execution)]]> - - - - - - - - - - + - + @@ -719,10 +691,10 @@ rbk.postProcessRequest(execution)]]> - + - + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateVnfAndModules.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateVnfAndModules.bpmn index ae77461070..c77c684fa4 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateVnfAndModules.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateVnfAndModules.bpmn @@ -63,6 +63,7 @@ exceptionUtil.processJavaException(execution)]]> + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json b/bpmn/so-bpmn-infrastructure-flows/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json index dc4669e8d9..13dd32226f 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json +++ b/bpmn/so-bpmn-infrastructure-flows/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json @@ -24,6 +24,7 @@ "cloudConfiguration": { "lcpCloudRegionId":"mdt1", + "cloudOwner" : "my-cloud-owner", "tenantId":"8b1df54faa3b49078e3416e21370a3ba" }, "requestParameters": diff --git a/bpmn/so-bpmn-infrastructure-flows/src/test/resources/__files/VCPE/DeleteVcpeResCustService/request.json b/bpmn/so-bpmn-infrastructure-flows/src/test/resources/__files/VCPE/DeleteVcpeResCustService/request.json index dc4669e8d9..13dd32226f 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/test/resources/__files/VCPE/DeleteVcpeResCustService/request.json +++ b/bpmn/so-bpmn-infrastructure-flows/src/test/resources/__files/VCPE/DeleteVcpeResCustService/request.json @@ -24,6 +24,7 @@ "cloudConfiguration": { "lcpCloudRegionId":"mdt1", + "cloudOwner" : "my-cloud-owner", "tenantId":"8b1df54faa3b49078e3416e21370a3ba" }, "requestParameters": diff --git a/bpmn/so-bpmn-infrastructure-flows/src/test/resources/application-test.yaml b/bpmn/so-bpmn-infrastructure-flows/src/test/resources/application-test.yaml index 8a5ade6fb6..dc48c79ff9 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/test/resources/application-test.yaml +++ b/bpmn/so-bpmn-infrastructure-flows/src/test/resources/application-test.yaml @@ -101,30 +101,6 @@ mso: version: '9' generic-vnf: version: '9' - v8: - customer: - uri: /aai/v8/business/customers/customer - generic-query: - uri: /aai/v8/search/generic-query - l3-network: - uri: /aai/v8/network/l3-networks/l3-network - network-policy: - uri: /aai/v8/network/network-policies/network-policy - nodes-query: - uri: /aai/v8/search/nodes-query - route-table-reference: - uri: /aai/v8/network/route-table-references/route-table-reference - tenant: - uri: /aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant - vce: - uri: /aai/v8/network/vces/vce - vpn-binding: - uri: /aai/v8/network/vpn-bindings/vpn-binding - v9: - cloud-region: - uri: /aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic - generic-vnf: - uri: /aai/v9/network/generic-vnfs/generic-vnf global: default: aai: diff --git a/bpmn/so-bpmn-infrastructure-flows/src/test/resources/application-test.yml b/bpmn/so-bpmn-infrastructure-flows/src/test/resources/application-test.yml index 007615e569..f214c61042 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/test/resources/application-test.yml +++ b/bpmn/so-bpmn-infrastructure-flows/src/test/resources/application-test.yml @@ -178,53 +178,6 @@ mso: version: '9' generic-vnf: version: '9' - v11: - customer: - uri: /aai/v11/business/customers/customer - generic-query: - uri: /aai/v11/search/generic-query - generic-vnf: - uri: /aai/v11/network/generic-vnfs/generic-vnf - l3-network: - uri: /aai/v11/network/l3-networks/l3-network - network-policy: - uri: /aai/v11/network/network-policies/network-policy - nodes-query: - uri: /aai/v11/search/nodes-query - route-table-reference: - uri: /aai/v11/network/route-table-references/route-table-reference - tenant: - uri: /aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant - vce: - uri: /aai/v11/network/vces/vce - vpn-binding: - uri: /aai/v11/network/vpn-bindings/vpn-binding - v8: - configuration: - uri: /aai/v11/network/configurations/configuration - customer: - uri: /aai/v8/business/customers/customer - generic-query: - uri: /aai/v8/search/generic-query - l3-network: - uri: /aai/v8/network/l3-networks/l3-network - network-policy: - uri: /aai/v8/network/network-policies/network-policy - nodes-query: - uri: /aai/v8/search/nodes-query - route-table-reference: - uri: /aai/v8/network/route-table-references/route-table-reference - tenant: - uri: /aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant - vce: - uri: /aai/v8/network/vces/vce - vpn-binding: - uri: /aai/v8/network/vpn-bindings/vpn-binding - v9: - cloud-region: - uri: /aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic - generic-vnf: - uri: /aai/v9/network/generic-vnfs/generic-vnf retry: attempts: '1' deleteCinderVolumeV1: -- cgit 1.2.3-korg