From fa9a707c87654330dfb5788a6029b8199c6cdf17 Mon Sep 17 00:00:00 2001 From: "Boslet, Cory" Date: Thu, 16 Apr 2020 10:43:38 -0400 Subject: move network adapter to an external client task Began impelenting new network external task. Made the vnfAdapterTask subflow an openstack subflow, refactored infra flows and BB to call it for network functions. Fixed bugs discovered through a robot dry run, added unit test, added support for rollback network request Updated junit test files for comparison due to not polling for response Removed the no longer used network adapter rest task from bpmn tasks Removed the unused network adapter async and its beans Removed network async client package from open pojo scan Issue-ID: SO-2813 Signed-off-by: Benjamin, Max (mb388a) Change-Id: I4c25892012cc86659ab122448ed1aca5cab91671 --- .../subprocess/DoCreateNetworkInstance.bpmn | 651 +++++++-------- .../DoCreateNetworkInstanceRollback.bpmn | 267 ++++--- .../resources/subprocess/DoCreateVfModule.bpmn | 890 ++++++++++----------- .../subprocess/DoCreateVfModuleRollback.bpmn | 584 +++++++------- .../subprocess/DoCreateVfModuleVolumeRollback.bpmn | 116 +-- .../subprocess/DoCreateVfModuleVolumeV2.bpmn | 182 ++--- .../subprocess/DoDeleteNetworkInstance.bpmn | 549 ++++++------- .../DoDeleteNetworkInstanceRollback.bpmn | 547 ------------- .../resources/subprocess/DoDeleteVfModule.bpmn | 228 +++--- .../subprocess/DoDeleteVfModuleFromVnf.bpmn | 202 ++--- .../subprocess/DoDeleteVfModuleVolumeV2.bpmn | 62 +- .../subprocess/DoUpdateNetworkInstance.bpmn | 497 +++++------- .../DoUpdateNetworkInstanceRollback.bpmn | 374 --------- .../resources/subprocess/DoUpdateVfModule.bpmn | 330 ++++---- 14 files changed, 2199 insertions(+), 3280 deletions(-) delete mode 100644 bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteNetworkInstanceRollback.bpmn delete mode 100644 bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateNetworkInstanceRollback.bpmn (limited to 'bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess') 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 c049eaafa0..76e6199fa6 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 @@ -24,8 +24,7 @@ DoCreateNetworkInstance.callRESTQueryAAICloudRegion(execution) SequenceFlow_11 import org.onap.so.bpmn.infrastructure.scripts.* def DoCreateNetworkInstance = new DoCreateNetworkInstance() -DoCreateNetworkInstance.prepareSDNCRequest(execution) - +DoCreateNetworkInstance.prepareSDNCRequest(execution) @@ -78,13 +77,6 @@ DoCreateNetworkInstance.callRESTQueryAAINetworkId(execution) SequenceFlow_12 - - SequenceFlow_59 - SequenceFlow_13 - import org.onap.so.bpmn.infrastructure.scripts.* -def DoCreateNetworkInstance = new DoCreateNetworkInstance() -DoCreateNetworkInstance.validateCreateNetworkResponse(execution) - isAAIQueryNameYes_SequenceFlow isNetworkActiveYes_SequenceFlow @@ -149,7 +141,7 @@ DoCreateNetworkInstance.prepareSDNCRollbackRequest(execution) isSdncRpc4No_SequenceFlow4 - #{execution.getVariable("sdncVersion") != '1610'} + #{execution.getVariable("sdncVersion") != '1610'} @@ -163,7 +155,7 @@ DoCreateNetworkInstance.prepareRpcSDNCRollbackRequest(execution) SequenceFlow_1qwubew - SequenceFlow_15sffxc + Flow_15l1pk2 SequenceFlow_096tad6 import org.onap.so.bpmn.infrastructure.scripts.* def DoCreateNetworkInstance = new DoCreateNetworkInstance() @@ -223,7 +215,7 @@ DoCreateNetworkInstance.postProcessResponse(execution) SequenceFlow_0bwpkkb SequenceFlow_15sffxc - + SequenceFlow_0b8j5rw SequenceFlow_12tlymf @@ -241,19 +233,24 @@ DoCreateNetworkInstance.postProcessResponse(execution) SequenceFlow_10ttvwn import org.onap.so.bpmn.infrastructure.scripts.* def DoCreateNetworkInstance = new DoCreateNetworkInstance() -DoCreateNetworkInstance.setExceptionFlag(execution) - +DoCreateNetworkInstance.setExceptionFlag(execution) + + SequenceFlow_15sffxc + Flow_15l1pk2 + import org.onap.so.bpmn.infrastructure.scripts.* +def DoCreateNetworkInstance = new DoCreateNetworkInstance() +DoCreateNetworkInstance.validateCreateNetworkResponse(execution) + + -    -Include ONLY inputs/varrables:   + Include ONLY inputs/varrables:   rollbackData, as Map -rollbackSDNCRequest -rollbackActivateSDNCRequest -rollbackNetworkRequest -WorkflowException -  +WorkflowException @@ -261,31 +258,7 @@ WorkflowException - - - - - ${CRENWKI_createNetworkRequest} - ${UrnPropertiesReader.getVariable("mso.adapters.network.rest.endpoint", execution)} - - - - #{BasicAuthHeaderValuePO} - application/xml - - - POST - ${statusCode} - ${response} - - http-connector - - - SequenceFlow_61 - SequenceFlow_59 - - - + SequenceFlow_13 SequenceFlow_35 @@ -349,10 +322,9 @@ DoCreateNetworkInstance.callRESTQueryAAINetworkPolicy(execution) SequenceFlow_61 import org.onap.so.bpmn.infrastructure.scripts.* def DoCreateNetworkInstance = new DoCreateNetworkInstance() -DoCreateNetworkInstance.prepareCreateNetworkRequest(execution) - +DoCreateNetworkInstance.prepareCreateNetworkRequest(execution) - + SequenceFlow_38 SequenceFlow_20 @@ -435,7 +407,7 @@ DoCreateNetworkInstance.validateRpcSDNCActivateResponse(execution) - #{execution.getVariable("sdncVersion") != '1610'} + #{execution.getVariable("sdncVersion") != '1610'} @@ -458,7 +430,7 @@ DoCreateNetworkInstance.validateRpcSDNCActivateResponse(execution)isSdncRpc2No_SequenceFlow2 - #{execution.getVariable("sdncVersion") != '1610'} + #{execution.getVariable("sdncVersion") != '1610'} @@ -466,8 +438,7 @@ DoCreateNetworkInstance.validateRpcSDNCActivateResponse(execution)SequenceFlow_0j8bxnb import org.onap.so.bpmn.infrastructure.scripts.* def DoCreateNetworkInstance = new DoCreateNetworkInstance() -DoCreateNetworkInstance.prepareRpcSDNCRequest(execution) - +DoCreateNetworkInstance.prepareRpcSDNCRequest(execution) SequenceFlow_1s8b1m1 @@ -500,781 +471,773 @@ DoCreateNetworkInstance.postProcessResponse(execution) def DoCreateNetworkInstance = new DoCreateNetworkInstance() DoCreateNetworkInstance.getServiceInstance(execution) - - if '200', Prepare PO Network Rollback - - + + + + + + + + SequenceFlow_61 + SequenceFlow_13 + - + - + - + - + - + - - + + - + - - - + + + - + - - - - + + + + - + - - - - + - + - + - + - + - + - - + + - + - - + + - + - + - + - + - - + + - - + + - - + + - + - - - - + + + + - + - + - - + + - + - - + + - + - - + + - + - + - + - + - - + + - + - - - - + + + + - - - - + + + + - - - - - - - - - - + - - - - - + + + - + - - + + - + - + - - - + + + - + - - + + - + - + - + - - - - + + + + - + - - - + + + - + - + - - - + + + - + - - + + - + - - - + + + - + - + - + - + - - + + - - + + - - - + + + - + - - - - + + + + - - - - + + + + - + - - - - + + + + - + - + - - - - + + + + - + - - + + - + - + - + - + - + - - + + - - + + - - + + - - + + - + - - + + - + - + - + - - - + + + - + - + - + - + - - + + - + - - - + + + - + - + - + - - - + + + - + - - + + - + - + - - + + - - + + - + - + - - + + - + - - - + + + - + - + - + - - + + - + - - - + + + - + - + - + - + - + - + - + - - - - + + + + - + - + - - + + - + - - - - + + + + - + - - + + - - + + - - - + + + - - + + - + - - + + - + - - + + - + - + - - + + - + - - + + - + - + - - + + - + - - + + - + - - + + - + - - - + + + - - - - - - - - + - - + + - + - - + + - + + + + + + + + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateNetworkInstanceRollback.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateNetworkInstanceRollback.bpmn index 6a4861b9a4..5103fa9d0a 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateNetworkInstanceRollback.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateNetworkInstanceRollback.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_1krl2dg @@ -7,9 +7,9 @@ SequenceFlow_1krl2dg SequenceFlow_0u41iz2 - import org.onap.so.bpmn.infrastructure.scripts.* def DoCreateNetworkInstanceRollback = new DoCreateNetworkInstanceRollback() -DoCreateNetworkInstanceRollback.preProcessRequest(execution)]]> +DoCreateNetworkInstanceRollback.preProcessRequest(execution) @@ -72,9 +72,9 @@ DoCreateNetworkInstanceRollback.preProcessRequest(execution)]]> SequenceFlow_0qc4v9t SequenceFlow_0el8yzs SequenceFlow_0yto4gz - import org.onap.so.bpmn.infrastructure.scripts.* def DoCreateNetworkInstanceRollback = new DoCreateNetworkInstanceRollback() -DoCreateNetworkInstanceRollback.validateRollbackResponses(execution)]]> +DoCreateNetworkInstanceRollback.validateRollbackResponses(execution) SequenceFlow_1lteduj @@ -84,20 +84,20 @@ DoCreateNetworkInstanceRollback.validateRollbackResponses(execution)]]> - + #{execution.getVariable("CRENWKIR_rollbackActivateSDNCRequest") != null} - - + + #{execution.getVariable("CRENWKIR_rollbackNetworkRequest") != null} - + #{execution.getVariable("CRENWKIR_rollbackSDNCRequest") != null} - + #{execution.getVariable("sdncVersion") != '1610'} SequenceFlow_0yto4gz @@ -109,9 +109,9 @@ DoCreateNetworkInstanceRollback.validateRollbackResponses(execution)]]> SequenceFlow_0xktw7v SequenceFlow_0soe5t3 - import org.onap.so.bpmn.infrastructure.scripts.* def DoCreateNetworkInstanceRollback = new DoCreateNetworkInstanceRollback() -DoCreateNetworkInstanceRollback.processJavaException(execution)]]> +DoCreateNetworkInstanceRollback.processJavaException(execution) SequenceFlow_0xktw7v @@ -137,9 +137,9 @@ DoCreateNetworkInstanceRollback.processJavaException(execution)]]> SequenceFlow_0q0te67 SequenceFlow_0lomcvn - import org.onap.so.bpmn.infrastructure.scripts.* execution.setVariable("workflowException", execution.getVariable("WorkflowException") -]]> + @@ -172,29 +172,41 @@ execution.setVariable("workflowException", execution.getVariable("WorkflowExcept - - SequenceFlow_0e1uixp + + Flow_0t2n952 SequenceFlow_17o4w67 - import org.onap.so.bpmn.infrastructure.scripts.* def DoCreateNetworkInstanceRollback = new DoCreateNetworkInstanceRollback() -DoCreateNetworkInstanceRollback.callPONetworkAdapter(execution)]]> +DoCreateNetworkInstanceRollback.setNetworkAdapterResponseCode(execution) - + + + + + + SequenceFlow_0e1uixp + Flow_0t2n952 + + + + Include ONLY inputs/varrables:   rollbackData, as Map -rollbackSDNCRequest -rollbackActivateSDNCRequest -rollbackNetworkRequest WorkflowException   -]]> - + + - + set value for: WorkflowException rolledBack wasDeleted -]]> - + + @@ -202,316 +214,321 @@ wasDeleted - + - + - - + + - - - + + + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - - + + - - + + - + - - + + - + - - - - + + - + - - - - + + + + - - + + - + - - + + - + - - - - + + + + - - - + + + - + - - + + - + - + - - + + - + - - - + + + - - + + - + - + - + - + - - + + - - + + - + - - + + - - - + + + - + - + - + - - + + - - + + - + - - + + - + - + - + - + - + - - + + - - + + - + + + + + + + + - \ No newline at end of file + 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 0d1b970c62..74e0600f4f 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 @@ -37,7 +37,7 @@ SequenceFlow_21 - + #{execution.getVariable("DCVFM_volumeGroupName") != null && execution.getVariable("DCVFM_volumeGroupName") != "" } @@ -76,19 +76,19 @@ SequenceFlow_20 SequenceFlow_1nh92s8 - import org.onap.so.bpmn.infrastructure.scripts.* String response = execution.getVariable("DCVFM_assignSDNCAdapterResponse") def doCreateVfModule = new DoCreateVfModule() -doCreateVfModule.validateSDNCResponse(execution, response, "assign")]]> +doCreateVfModule.validateSDNCResponse(execution, response, "assign") SequenceFlow_8 SequenceFlow_18 - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModule = new DoCreateVfModule() -doCreateVfModule.preProcessSDNCAssignRequest(execution)]]> +doCreateVfModule.preProcessSDNCAssignRequest(execution) @@ -96,9 +96,9 @@ doCreateVfModule.preProcessSDNCAssignRequest(execution)]]> SequenceFlow_0p61zug SequenceFlow_0aegg0r SequenceFlow_23 - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModule = new DoCreateVfModule() -doCreateVfModule.preProcessSDNCGetRequest(execution, "vfmodule")]]> +doCreateVfModule.preProcessSDNCGetRequest(execution, "vfmodule") @@ -118,12 +118,12 @@ doCreateVfModule.preProcessSDNCGetRequest(execution, "vfmodule")]]> SequenceFlow_24 SequenceFlow_31 - import org.onap.so.bpmn.infrastructure.scripts.* String response = execution.getVariable("DCVFM_getSDNCAdapterResponse") def doCreateVfModule = new DoCreateVfModule() -doCreateVfModule.validateSDNCResponse(execution, response, "get")]]> +doCreateVfModule.validateSDNCResponse(execution, response, "get") @@ -138,16 +138,16 @@ doCreateVfModule.validateSDNCResponse(execution, response, "get")]]> SequenceFlow_1avfxsz SequenceFlow_5 - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModule = new DoCreateVfModule() -doCreateVfModule.preProcessUpdateAAIVfModuleRequestOrch(execution)]]> +doCreateVfModule.preProcessUpdateAAIVfModuleRequestOrch(execution) SequenceFlow_10 SequenceFlow_12 - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModule = new DoCreateVfModule() -doCreateVfModule.preProcessSDNCActivateRequest(execution)]]> +doCreateVfModule.preProcessSDNCActivateRequest(execution) @@ -165,12 +165,12 @@ doCreateVfModule.preProcessSDNCActivateRequest(execution)]]> SequenceFlow_13 SequenceFlow_14 - import org.onap.so.bpmn.infrastructure.scripts.* String response = execution.getVariable("DCVFM_activateSDNCAdapterResponse") def doCreateVfModule = new DoCreateVfModule() -doCreateVfModule.validateSDNCResponse(execution, response, "activate")]]> +doCreateVfModule.validateSDNCResponse(execution, response, "activate") SequenceFlow_14 @@ -195,9 +195,9 @@ doCreateVfModule.validateSDNCResponse(execution, response, "activate")]]> SequenceFlow_28 SequenceFlow_3 - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModule = new DoCreateVfModule() -doCreateVfModule.prepareCreateAAIVfModuleVolumeGroupRequest(execution)]]> +doCreateVfModule.prepareCreateAAIVfModuleVolumeGroupRequest(execution) @@ -220,13 +220,13 @@ doCreateVfModule.prepareCreateAAIVfModuleVolumeGroupRequest(execution)]]> SequenceFlow_31 SequenceFlow_32 - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModule = new DoCreateVfModule() -doCreateVfModule.preProcessVNFAdapterRequest(execution)]]> +doCreateVfModule.preProcessVNFAdapterRequest(execution) - + - + @@ -239,9 +239,9 @@ doCreateVfModule.preProcessVNFAdapterRequest(execution)]]> SequenceFlow_33 SequenceFlow_1ushk1d - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModule = new DoCreateVfModule() -doCreateVfModule.postProcessVNFAdapterRequest(execution)]]> +doCreateVfModule.postProcessVNFAdapterRequest(execution) SequenceFlow_0xfanpi @@ -265,9 +265,9 @@ doCreateVfModule.postProcessVNFAdapterRequest(execution)]]> SequenceFlow_25 SequenceFlow_27 - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModule = new DoCreateVfModule() -doCreateVfModule.postProcessCreateAAIVfModule(execution)]]> +doCreateVfModule.postProcessCreateAAIVfModule(execution) @@ -277,22 +277,22 @@ doCreateVfModule.postProcessCreateAAIVfModule(execution)]]> - + execution.getVariable("DCVFM_isBaseVfModule") == "true" SequenceFlow_36 SequenceFlow_37 - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModule = new DoCreateVfModule() -doCreateVfModule.queryAAIVfModule(execution)]]> +doCreateVfModule.queryAAIVfModule(execution) SequenceFlow_16 SequenceFlow_7 - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModule = new DoCreateVfModule() -doCreateVfModule.setSuccessIndicator(execution, true)]]> +doCreateVfModule.setSuccessIndicator(execution, true) @@ -302,20 +302,20 @@ doCreateVfModule.setSuccessIndicator(execution, true)]]> SequenceFlow_40 SequenceFlow_43 - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModule = new DoCreateVfModule() -return doCreateVfModule.queryCloudRegion(execution)]]> +return doCreateVfModule.queryCloudRegion(execution) - + #{execution.getVariable("DCVFM_volumeGroupId") != null && execution.getVariable("DCVFM_volumeGroupId") != "" } SequenceFlow_1 SequenceFlow_4 - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModule = new DoCreateVfModule() -doCreateVfModule.preProcessRequest(execution)]]> +doCreateVfModule.preProcessRequest(execution) @@ -352,16 +352,16 @@ doCreateVfModule.preProcessRequest(execution)]]> - + execution.getVariable("DCVFM_contrailNetworkPolicyFqdnList") != null && !execution.getVariable("DCVFM_contrailNetworkPolicyFqdnList").isEmpty() SequenceFlow_0ery1pk SequenceFlow_0abffyj - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModule = new DoCreateVfModule() -doCreateVfModule.createNetworkPoliciesInAAI(execution)]]> +doCreateVfModule.createNetworkPoliciesInAAI(execution) SequenceFlow_0363dz7 @@ -374,7 +374,7 @@ doCreateVfModule.createNetworkPoliciesInAAI(execution)]]> SequenceFlow_1avfxsz - + !execution.getVariable("DCVFM_oamManagementV4Address").isEmpty() || !execution.getVariable("DCVFM_oamManagementV6Address").isEmpty() @@ -384,9 +384,9 @@ doCreateVfModule.createNetworkPoliciesInAAI(execution)]]> SequenceFlow_0bi38s7 SequenceFlow_1qm81ym - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModule = new DoCreateVfModule() -doCreateVfModule.prepUpdateAAIGenericVnf(execution)]]> +doCreateVfModule.prepUpdateAAIGenericVnf(execution) @@ -401,16 +401,16 @@ doCreateVfModule.prepUpdateAAIGenericVnf(execution)]]> - + #{execution.getVariable("DCVFM_sdncVersion" ) == '1707'} SequenceFlow_0m382su SequenceFlow_0g270u0 - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModule = new DoCreateVfModule() -doCreateVfModule.preProcessSDNCGetRequest(execution, 'vnf')]]> +doCreateVfModule.preProcessSDNCGetRequest(execution, 'vnf') @@ -428,12 +428,12 @@ doCreateVfModule.preProcessSDNCGetRequest(execution, 'vnf')]]> SequenceFlow_1yrlvgb SequenceFlow_170kw7h - import org.onap.so.bpmn.infrastructure.scripts.* String response = execution.getVariable("DCVFM_getVnfSDNCAdapterResponse") def doCreateVfModule = new DoCreateVfModule() -doCreateVfModule.validateSDNCResponse(execution, response, "get")]]> +doCreateVfModule.validateSDNCResponse(execution, response, "get") @@ -445,7 +445,7 @@ doCreateVfModule.validateSDNCResponse(execution, response, "get")]]> - + #{execution.getVariable("DCVFM_vfModuleName") == null} @@ -486,16 +486,16 @@ doCreateVfModule.validateSDNCResponse(execution, response, "get")]]> SequenceFlow_04bd5in SequenceFlow_1i1q78e - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModule = new DoCreateVfModule() -doCreateVfModule.preProcessRollback(execution)]]> +doCreateVfModule.preProcessRollback(execution) SequenceFlow_0112l2c SequenceFlow_0z2rczk - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModule = new DoCreateVfModule() -doCreateVfModule.postProcessRollback(execution)]]> +doCreateVfModule.postProcessRollback(execution) @@ -508,14 +508,14 @@ doCreateVfModule.postProcessRollback(execution)]]> - + #{execution.getVariable("disableRollback" ) == true} SequenceFlow_1nh7m8d SequenceFlow_1pgo10r - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModule = new DoCreateVfModule() -doCreateVfModule.processBPMNException(execution)]]> +doCreateVfModule.processBPMNException(execution) @@ -525,7 +525,7 @@ doCreateVfModule.processBPMNException(execution)]]> SequenceFlow_006rnym - + #{execution.getVariable("DCVFM_volumeGroupId") != null && execution.getVariable("DCVFM_volumeGroupId") != "" } SequenceFlow_4 @@ -540,18 +540,18 @@ doCreateVfModule.processBPMNException(execution)]]> - + execution.getVariable("DCVFM_aLaCarte") == true - + execution.getVariable("DCVFM_twoPhaseDesign") == true SequenceFlow_00bh7m7 - + execution.getVariable("DCVFM_orchestrationStatus") == "PendingActivation" || execution.getVariable("DCVFM_orchestrationStatus") == "Assigned" SequenceFlow_1nh92s8 @@ -559,7 +559,7 @@ doCreateVfModule.processBPMNException(execution)]]> SequenceFlow_1iyt5i4 - + execution.getVariable("DCVFM_aLaCarte") == true @@ -581,30 +581,30 @@ doCreateVfModule.processBPMNException(execution)]]> SequenceFlow_17cp3tn SequenceFlow_0ynd0iy - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModule = new DoCreateVfModule() -doCreateVfModule.preProcessUpdateAAIVfModuleRequestStatus(execution, 'PendingActivation')]]> +doCreateVfModule.preProcessUpdateAAIVfModuleRequestStatus(execution, 'PendingActivation') SequenceFlow_16mgvsd SequenceFlow_0cc17yk - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModule = new DoCreateVfModule() -doCreateVfModule.queryCatalogDB(execution)]]> +doCreateVfModule.queryCatalogDB(execution) SequenceFlow_1y8q87e SequenceFlow_1sf1091 - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModule = new DoCreateVfModule() -doCreateVfModule.queryAAIVfModuleForStatus(execution)]]> +doCreateVfModule.queryAAIVfModuleForStatus(execution) SequenceFlow_1mnipp8 SequenceFlow_00bh7m7 - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModule = new DoCreateVfModule() -doCreateVfModule.setSuccessIndicator(execution, true)]]> +doCreateVfModule.setSuccessIndicator(execution, true) SequenceFlow_15i583d @@ -613,7 +613,7 @@ doCreateVfModule.setSuccessIndicator(execution, true)]]> - + #{execution.getVariable("DCVFM_volumeGroupId") != null && execution.getVariable("DCVFM_volumeGroupId") != "" } SequenceFlow_0tfrcnc @@ -629,7 +629,7 @@ doCreateVfModule.setSuccessIndicator(execution, true)]]> SequenceFlow_0p3cspl - + execution.getVariable("DCVFM_isBaseVfModule") == "true" @@ -642,9 +642,9 @@ doCreateVfModule.setSuccessIndicator(execution, true)]]> SequenceFlow_0oadvvx SequenceFlow_03batve - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModule = new DoCreateVfModule() -return doCreateVfModule.queryCloudRegion(execution)]]> +return doCreateVfModule.queryCloudRegion(execution) @@ -663,17 +663,17 @@ return doCreateVfModule.queryCloudRegion(execution)]]> SequenceFlow_0p3cspl SequenceFlow_1k7xbcu - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModule = new DoCreateVfModule() -doCreateVfModule.queryAAIVfModule(execution)]]> +doCreateVfModule.queryAAIVfModule(execution) SequenceFlow_006rnym SequenceFlow_1iyt5i4 SequenceFlow_0thm33s - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModule = new DoCreateVfModule() -doCreateVfModule.preProcessUpdateAAIVfModuleRequestStatus(execution, 'Assigned')]]> +doCreateVfModule.preProcessUpdateAAIVfModuleRequestStatus(execution, 'Assigned') @@ -693,983 +693,983 @@ doCreateVfModule.preProcessUpdateAAIVfModuleRequestStatus(execution, 'Assigned') - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - - - - + + + + - - - + + + - + - - - - + + + + - + - + - - + + - + - - + + - + - - - + + + - + - - - + + + - - - + + + - - - - + + + + - + - + - + - + - + - + - - - - + + + + - - - - + + + + - - - - + + + + - + - + - - - - + + + + - - - - + + + + - + - + - + - - + + - - + + - - - - + + + + - - + + - - - - + + + + - + - - + + - + - + - + - + - + - - + + - + - + - - - - + + + + - - + + - - + + - + - + - + - + - + - - - + + + - + - - + + - + - + - - - - + + + + - - - - + + + + - + - - + + - + - - - - + + + + - + - - - - - + + + + + - + - - + + - + - + - - + + - - - + + + - + - - + + - + - - - + + + - + - + - + - + - - - + + + - + - - - - + + + + - - - + + + - - + + - + - - - - + + + + - - + + - + - + - - + + - + - - - + + + - + - - + + - - + + - + - + - + - - - - + + + + - - - + + + - + - + - - + + - + - - - + + + - + - + - + - + - + - + - + - + - - + + - - - - + + + + - - + + - - + + - + - + - - + + - + - - - + + + - + - + - - - + + + - + - + - - + + - + - + - + - - + + - + - + - + - - - + + + - + - - + + - + - - + + - - + + - + - + - - + + - + - + - + - - + + - + - - + + - - + + - - - - - + + + + + - + - - - - + + + + - + - - + + - - + + - - + + - + - + - + - + - + - + - + - - + + - + - - - + + + - + - + - - + + - - + + - - - + + + - + - + - - + + - + - - - + + + - + - + - - - - - - + + + + + + - - - + + + - + - + - + - + - + - - + + - - - - - + + + + + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleRollback.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleRollback.bpmn index e9675b89f8..699ee5bcd1 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleRollback.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleRollback.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_1 @@ -21,7 +21,7 @@ SequenceFlow_8 - + execution.getVariable("DCVFMR_rollbackPrepareUpdateVfModule") == "true" && !(execution.getVariable('aLaCarte') == true && execution.getVariable("DCVFMR_rollbackSDNCRequestAssign") == "true") @@ -34,15 +34,15 @@ SequenceFlow_1p0v6yk SequenceFlow_16 - import org.onap.so.bpmn.infrastructure.scripts.* def dcvfmr = new DoCreateVfModuleRollback() -dcvfmr.prepVNFAdapterRequest(execution)]]> +dcvfmr.prepVNFAdapterRequest(execution) - + - + @@ -51,15 +51,15 @@ dcvfmr.prepVNFAdapterRequest(execution)]]> SequenceFlow_08aruzz - + #{execution.getVariable("DCVFMR_rollbackSDNCRequestActivate") == "true" && execution.getVariable("sdncVersion") == "1707"} SequenceFlow_13 SequenceFlow_14 - import org.onap.so.bpmn.infrastructure.scripts.* def dcvfmr = new DoCreateVfModuleRollback() -dcvfmr.prepUpdateAAIVfModule(execution)]]> +dcvfmr.prepUpdateAAIVfModule(execution) @@ -78,7 +78,7 @@ dcvfmr.prepUpdateAAIVfModule(execution)]]> SequenceFlow_17 - + #{execution.getVariable("DCVFMR_rollbackUpdateAAIVfModule") == "true"} @@ -88,15 +88,15 @@ dcvfmr.prepUpdateAAIVfModule(execution)]]> SequenceFlow_20 - + #{execution.getVariable("DCVFMR_rollbackSDNCRequestAssign") == "true" || execution.getVariable("DCVFMR_rollbackSDNCRequestActivate") == "true"} SequenceFlow_1rpg6ac SequenceFlow_32 - import org.onap.so.bpmn.infrastructure.scripts.* def dcvfmr = new DoCreateVfModuleRollback() -dcvfmr.prepSDNCAdapterRequest(execution)]]> +dcvfmr.prepSDNCAdapterRequest(execution) @@ -121,7 +121,7 @@ dcvfmr.prepSDNCAdapterRequest(execution)]]> - + #{execution.getVariable("DCVFMR_rollbackCreateAAIVfModule") == "true"} @@ -141,18 +141,18 @@ dcvfmr.prepSDNCAdapterRequest(execution)]]> SequenceFlow_24 SequenceFlow_34 - import org.onap.so.bpmn.infrastructure.scripts.* def dcvfmr = new DoCreateVfModuleRollback() -dcvfmr.prepDeleteAAIVfModule(execution)]]> +dcvfmr.prepDeleteAAIVfModule(execution) SequenceFlow_2 SequenceFlow_4 - import org.onap.so.bpmn.infrastructure.scripts.* def dcvfmr = new DoCreateVfModuleRollback() -dcvfmr.sdncValidateResponse(execution, DCVFMR_DoCreateVfModuleRollbackResponse)]]> +dcvfmr.sdncValidateResponse(execution, DCVFMR_DoCreateVfModuleRollbackResponse) @@ -168,18 +168,18 @@ dcvfmr.sdncValidateResponse(execution, DCVFMR_DoCreateVfModuleRollbackResponse)] SequenceFlow_02fx6z6 SequenceFlow_22 - import org.onap.so.bpmn.infrastructure.scripts.* def dcvfmr = new DoCreateVfModuleRollback() dcvfmr.logWorkflowException(execution, 'DoCreateVfModuleRollback caught an event') -dcvfmr.saveWorkflowException(execution, 'DCVFMR_CaughtWorkflowException1')]]> +dcvfmr.saveWorkflowException(execution, 'DCVFMR_CaughtWorkflowException1') SequenceFlow_12 SequenceFlow_02fx6z6 - import org.onap.so.bpmn.infrastructure.scripts.* def dcvfmr = new DoCreateVfModuleRollback() -dcvfmr.setFailedRollbackStatus(execution)]]> +dcvfmr.setFailedRollbackStatus(execution) @@ -193,9 +193,9 @@ dcvfmr.setFailedRollbackStatus(execution)]]> SequenceFlow_1 SequenceFlow_5 - import org.onap.so.bpmn.infrastructure.scripts.* def dcvfmr = new DoCreateVfModuleRollback() -dcvfmr.preProcessRequest(execution)]]> +dcvfmr.preProcessRequest(execution) @@ -207,16 +207,16 @@ dcvfmr.preProcessRequest(execution)]]> SequenceFlow_0unumxv SequenceFlow_0djpj3r - import org.onap.so.bpmn.infrastructure.scripts.* def dcvfmr = new DoCreateVfModuleRollback() -dcvfmr.deleteNetworkPoliciesFromAAI(execution)]]> +dcvfmr.deleteNetworkPoliciesFromAAI(execution) SequenceFlow_111l1he SequenceFlow_0ca4brn - import org.onap.so.bpmn.infrastructure.scripts.* def dcvfmr = new DoCreateVfModuleRollback() -dcvfmr.preProcessUpdateAAIGenericVnf(execution)]]> +dcvfmr.preProcessUpdateAAIGenericVnf(execution) @@ -238,12 +238,12 @@ dcvfmr.preProcessUpdateAAIGenericVnf(execution)]]> - + #{execution.getVariable("DCVFMR_rollbackUpdateVnfAAI") == "true"} - + #{execution.getVariable("DCVFMR_rollbackVnfAdapterCreate") == "true"} @@ -253,7 +253,7 @@ dcvfmr.preProcessUpdateAAIGenericVnf(execution)]]> - + #{execution.getVariable("skipRollback" ) == true} SequenceFlow_06rm0hg @@ -264,9 +264,9 @@ dcvfmr.preProcessUpdateAAIGenericVnf(execution)]]> SequenceFlow_10 SequenceFlow_0ugalf8 - import org.onap.so.bpmn.infrastructure.scripts.* def dcvfmr = new DoCreateVfModuleRollback() -dcvfmr.preProcessSDNCDeactivateRequest(execution)]]> +dcvfmr.preProcessSDNCDeactivateRequest(execution) @@ -284,26 +284,26 @@ dcvfmr.preProcessSDNCDeactivateRequest(execution)]]> SequenceFlow_0n78x37 SequenceFlow_06rm0hg - import org.onap.so.bpmn.infrastructure.scripts.* def dcvfmr = new DoCreateVfModuleRollback() String response = execution.getVariable("DCVFMR_deactivateSDNCAdapterResponse") -dcvfmr.sdncValidateResponse(execution, response)]]> +dcvfmr.sdncValidateResponse(execution, response) - + #{execution.getVariable("DCVFMR_rollbackCreateNetworkPoliciesAAI") == "true"} SequenceFlow_16ghmax SequenceFlow_1iufuuu - import org.onap.so.bpmn.infrastructure.scripts.* def dcvfmr = new DoCreateVfModuleRollback() -dcvfmr.preProcessSDNCUnassignRequest(execution)]]> +dcvfmr.preProcessSDNCUnassignRequest(execution) @@ -321,10 +321,10 @@ dcvfmr.preProcessSDNCUnassignRequest(execution)]]> SequenceFlow_1l4n37b SequenceFlow_12otwa4 - import org.onap.so.bpmn.infrastructure.scripts.* def dcvfmr = new DoCreateVfModuleRollback() String response = execution.getVariable("DCVFMR_unassignSDNCAdapterResponse") -dcvfmr.sdncValidateResponse(execution, response)]]> +dcvfmr.sdncValidateResponse(execution, response) SequenceFlow_19 @@ -333,7 +333,7 @@ dcvfmr.sdncValidateResponse(execution, response)]]> - + #{execution.getVariable("DCVFMR_rollbackSDNCRequestAssign") == "true" && execution.getVariable("sdncVersion") == "1707"} @@ -342,9 +342,9 @@ dcvfmr.sdncValidateResponse(execution, response)]]> SequenceFlow_35 SequenceFlow_17it51d SequenceFlow_1h8ve60 - import org.onap.so.bpmn.infrastructure.scripts.* def dcvfmr = new DoCreateVfModuleRollback() -dcvfmr.setSuccessfulRollbackStatus(execution)]]> +dcvfmr.setSuccessfulRollbackStatus(execution) SequenceFlow_03i4czf @@ -354,7 +354,7 @@ dcvfmr.setSuccessfulRollbackStatus(execution)]]> - + execution.getVariable('aLaCarte') == true && execution.getVariable("DCVFMR_rollbackSDNCRequestAssign") == "true" @@ -370,9 +370,9 @@ dcvfmr.setSuccessfulRollbackStatus(execution)]]> SequenceFlow_17ne2iz SequenceFlow_0fvuowt - import org.onap.so.bpmn.infrastructure.scripts.* def dcvfmr = new DoCreateVfModuleRollback() -dcvfmr.prepUpdateAAIVfModuleToAssigned(execution)]]> +dcvfmr.prepUpdateAAIVfModuleToAssigned(execution) @@ -381,593 +381,593 @@ dcvfmr.prepUpdateAAIVfModuleToAssigned(execution)]]> - + - + - - + + - + - + - + - - + + - + - + - + - + - + - + - - + + - - + + - + - - - - + + + + - + - + - - - + + + - + - + - - - + + + - + - - - - + + + + - - + + - + - - - - - - + + + + + + - + - + - + - - - - + + + + - + - - + + - + - + - - - - - - - + + + + + + + - + - - + + - + - - - + + + - - - - - - + + + + + + - + - + - + - - - - - - - + + + + + + + - + - - - + + + - + - - - - - + + + + + - + - + - - + + - - - + + + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - - - + + + - + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - - - + + + - - - - - + + + + + - + - - - - - - + + + + + + - + - + - + - - + + - + - - - - + + + + - + - - + + - - - + + + - + - + - + - + - + - - + + - - + + - - - + + + - - - - - - + + + + + + - + - - - - - + + + + + - + - - + + - - + + - + - + - + - + - + - - - + + + - + - - - + + + - + - - - - + + + + - - + + - + - - + + - + - + - + - - + + - + - - - - - + + + + + - + - - - + + + - - + + - + - + - - - + + + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleVolumeRollback.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleVolumeRollback.bpmn index 6f3dceda84..b5cb1bf255 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleVolumeRollback.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleVolumeRollback.bpmn @@ -1,13 +1,13 @@ - + SequenceFlow_0xktw7v SequenceFlow_0soe5t3 - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModuleVolumeRollback = new DoCreateVfModuleVolumeRollback() -doCreateVfModuleVolumeRollback.processJavaException(execution)]]> +doCreateVfModuleVolumeRollback.processJavaException(execution) SequenceFlow_0xktw7v @@ -33,9 +33,9 @@ doCreateVfModuleVolumeRollback.processJavaException(execution)]]> SequenceFlow_0h7k68j SequenceFlow_10dawse - + - + @@ -44,15 +44,15 @@ doCreateVfModuleVolumeRollback.processJavaException(execution)]]> SequenceFlow_0bv04qn - + #{execution.getVariable("DCVFMODVOLRBK_isCreateVnfRollbackNeeded") == "true"} SequenceFlow_0bv04qn SequenceFlow_17k6oyz SequenceFlow_13nb3n0 - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModuleVolumeRollback = new DoCreateVfModuleVolumeRollback() -doCreateVfModuleVolumeRollback.executeMethod('callRESTDeleteAAIVolumeGroup', execution, isDebugLogEnabled)]]> +doCreateVfModuleVolumeRollback.executeMethod('callRESTDeleteAAIVolumeGroup', execution, isDebugLogEnabled) @@ -63,7 +63,7 @@ doCreateVfModuleVolumeRollback.executeMethod('callRESTDeleteAAIVolumeGroup', exe SequenceFlow_1do0853 - + #{execution.getVariable("DCVFMODVOLRBK_isAAIRollbackNeeded" ) == "true"} @@ -74,14 +74,14 @@ doCreateVfModuleVolumeRollback.executeMethod('callRESTDeleteAAIVolumeGroup', exe SequenceFlow_13nb3n0 - + #{execution.getVariable("DCVFMODVOLRBK_backoutOnFailure") != "false"} SequenceFlow_0qreiaa SequenceFlow_1xah9es - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModuleVolumeRollback = new DoCreateVfModuleVolumeRollback() -doCreateVfModuleVolumeRollback.preProcessRequest(execution)]]> +doCreateVfModuleVolumeRollback.preProcessRequest(execution) @@ -90,153 +90,153 @@ doCreateVfModuleVolumeRollback.preProcessRequest(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 58ea0c4951..5dc9878561 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,27 +1,27 @@ - + SequenceFlow_1 SequenceFlow_1wi1cf9 - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2() -doCreateVfModuleVolumeV2.executeMethod('preProcessRequest', execution, isDebugLogEnabled)]]> +doCreateVfModuleVolumeV2.executeMethod('preProcessRequest', execution, isDebugLogEnabled) SequenceFlow_1dpt7ul SequenceFlow_23 - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2() -doCreateVfModuleVolumeV2.executeMethod('callRESTQueryAAICloudRegion', execution, isDebugLogEnabled)]]> +doCreateVfModuleVolumeV2.executeMethod('callRESTQueryAAICloudRegion', execution, isDebugLogEnabled) SequenceFlow_volGrpName404No SequenceFlow_7 - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2() -doCreateVfModuleVolumeV2.executeMethod('buildWorkflowException', execution, 2500, "Volume group name already exists in the system.", isDebugLogEnabled)]]> +doCreateVfModuleVolumeV2.executeMethod('buildWorkflowException', execution, 2500, "Volume group name already exists in the system.", isDebugLogEnabled) @@ -31,15 +31,15 @@ doCreateVfModuleVolumeV2.executeMethod('buildWorkflowException', execution, 2500 SequenceFlow_volGrpName404No - + #{DCVFMODVOLV2_AaiReturnCode == '404'} SequenceFlow_23 SequenceFlow_14 - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2() -doCreateVfModuleVolumeV2.executeMethod('callRESTQueryAAIGenericVnf', execution, isDebugLogEnabled)]]> +doCreateVfModuleVolumeV2.executeMethod('callRESTQueryAAIGenericVnf', execution, isDebugLogEnabled) @@ -50,22 +50,22 @@ doCreateVfModuleVolumeV2.executeMethod('callRESTQueryAAIGenericVnf', execution, SequenceFlow_14 SequenceFlow_6 - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2() -doCreateVfModuleVolumeV2.executeMethod('callRESTQueryAAIVolGrpName', execution, isDebugLogEnabled)]]> +doCreateVfModuleVolumeV2.executeMethod('callRESTQueryAAIVolGrpName', execution, isDebugLogEnabled) SequenceFlow_volGrpName404Yes SequenceFlow_9 - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2() -doCreateVfModuleVolumeV2.executeMethod('callRESTCreateAAIVolGrpName', execution, isDebugLogEnabled)]]> +doCreateVfModuleVolumeV2.executeMethod('callRESTCreateAAIVolGrpName', execution, isDebugLogEnabled) - + - + @@ -79,25 +79,25 @@ doCreateVfModuleVolumeV2.executeMethod('callRESTCreateAAIVolGrpName', execution, SequenceFlow_1gbt2n5 SequenceFlow_28 - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2() -doCreateVfModuleVolumeV2.executeMethod('callRESTQueryAAIVolGrpName', execution, isDebugLogEnabled)]]> +doCreateVfModuleVolumeV2.executeMethod('callRESTQueryAAIVolGrpName', execution, isDebugLogEnabled) SequenceFlow_5 SequenceFlow_8 - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2() -doCreateVfModuleVolumeV2.executeMethod('setSuccessIndicator', execution, true)]]> +doCreateVfModuleVolumeV2.executeMethod('setSuccessIndicator', execution, true) SequenceFlow_28 SequenceFlow_5 - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2() -doCreateVfModuleVolumeV2.executeMethod('callRESTUpdateCreatedVolGrpName', execution, isDebugLogEnabled)]]> +doCreateVfModuleVolumeV2.executeMethod('callRESTUpdateCreatedVolGrpName', execution, isDebugLogEnabled) @@ -106,9 +106,9 @@ doCreateVfModuleVolumeV2.executeMethod('callRESTUpdateCreatedVolGrpName', execut SequenceFlow_9 SequenceFlow_10 - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2() -doCreateVfModuleVolumeV2.executeMethod('prepareVnfAdapterCreateRequest', execution, isDebugLogEnabled)]]> +doCreateVfModuleVolumeV2.executeMethod('prepareVnfAdapterCreateRequest', execution, isDebugLogEnabled) @@ -121,18 +121,18 @@ doCreateVfModuleVolumeV2.executeMethod('prepareVnfAdapterCreateRequest', executi SequenceFlow_1qwurc5 SequenceFlow_1gbt2n5 - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2() -doCreateVfModuleVolumeV2.executeMethod('validateVnfResponse', execution, isDebugLogEnabled)]]> +doCreateVfModuleVolumeV2.executeMethod('validateVnfResponse', execution, isDebugLogEnabled) SequenceFlow_1wi1cf9 SequenceFlow_1dpt7ul - import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2() -doCreateVfModuleVolumeV2.executeMethod('getServiceInstance', execution, isDebugLogEnabled)]]> +doCreateVfModuleVolumeV2.executeMethod('getServiceInstance', execution, isDebugLogEnabled) @@ -142,194 +142,194 @@ doCreateVfModuleVolumeV2.executeMethod('getServiceInstance', execution, isDebugL - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - - - - + + + + + - + - - + + - - + + - - + + - + - - + + - - - - + + + + - - + + - + - - + + - - + + - - + + - + - - + + - + - - + + - + - + - + - - + + - - + + - + - - + + - - + + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteNetworkInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteNetworkInstance.bpmn index d6069d714e..5edbf3cd55 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteNetworkInstance.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteNetworkInstance.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_1 @@ -8,9 +8,9 @@ SequenceFlow_0msqfwu SequenceFlow_6 - import org.onap.so.bpmn.infrastructure.scripts.* def callRESTDeleteAAI = new DoDeleteNetworkInstance() -callRESTDeleteAAI.callRESTQueryAAI(execution)]]> +callRESTDeleteAAI.callRESTQueryAAI(execution) @@ -31,10 +31,9 @@ callRESTDeleteAAI.callRESTQueryAAI(execution)]]> SequenceFlow_12 SequenceFlow_1jnva78 SequenceFlow_5 - import org.onap.so.bpmn.infrastructure.scripts.* def validateSDNCResponse = new DoDeleteNetworkInstance() -validateSDNCResponse.validateSDNCResponse(execution) -]]> +validateSDNCResponse.validateSDNCResponse(execution) @@ -54,7 +53,7 @@ validateSDNCResponse.validateSDNCResponse(execution) - + #{execution.getVariable("DELNWKI_sdncResponseSuccess" ) == true} @@ -67,18 +66,17 @@ validateSDNCResponse.validateSDNCResponse(execution) SequenceFlow_1nl99y6 SequenceFlow_1yvnovn - import org.onap.so.bpmn.infrastructure.scripts.* def DoDeleteNetworkInstance = new DoDeleteNetworkInstance() -DoDeleteNetworkInstance.postProcessResponse(execution) -]]> +DoDeleteNetworkInstance.postProcessResponse(execution) SequenceFlow_1wif0e5 - import org.onap.so.bpmn.infrastructure.scripts.* def DoDeleteNetworkInstance = new DoDeleteNetworkInstance() -DoDeleteNetworkInstance.prepareRpcSDNCDeactivateRollback(execution)]]> +DoDeleteNetworkInstance.prepareRpcSDNCDeactivateRollback(execution) SequenceFlow_021b0sz @@ -86,33 +84,16 @@ DoDeleteNetworkInstance.prepareRpcSDNCDeactivateRollback(execution)]]>SequenceFlow_1suj1nc - + #{execution.getVariable("DELNWKI_rollbackEnabled") == true} - - - - - - - - - - - - - - - - SequenceFlow_147vc14 - SequenceFlow_0tiz0kk SequenceFlow_0jb7rws SequenceFlow_1raa09h - + #{execution.getVariable("DELNWKI_isSdncDeactivateRollbackNeeded") == true} SequenceFlow_1suj1nc @@ -124,24 +105,19 @@ DoDeleteNetworkInstance.prepareRpcSDNCDeactivateRollback(execution)]]> SequenceFlow_1wif0e5 - SequenceFlow_147vc14 - import org.onap.so.bpmn.infrastructure.scripts.* def DoDeleteNetworkInstance = new DoDeleteNetworkInstance() -DoDeleteNetworkInstance.prepareRollbackData(execution)]]> +DoDeleteNetworkInstance.prepareRollbackData(execution) - SequenceFlow_1a51h25 SequenceFlow_021b0sz - import org.onap.so.bpmn.infrastructure.scripts.* def DoDeleteNetworkInstance = new DoDeleteNetworkInstance() -DoDeleteNetworkInstance.setExceptionFlag(execution)]]> +DoDeleteNetworkInstance.setExceptionFlag(execution) - Rollback Not Needed for Delete. - - isRelationshipExistNo_SequenceFlow @@ -149,7 +125,7 @@ DoDeleteNetworkInstance.setExceptionFlag(execution)]]> querySuccessNo_SequenceFlow - + #{execution.getVariable("DELNWKI_isAAIGood") == true} @@ -159,7 +135,7 @@ DoDeleteNetworkInstance.setExceptionFlag(execution)]]> - + #{execution.getVariable("DELNWKI_aaiReturnCode" ) == "404"} isReturnCode404_No_SequenceFlow @@ -172,7 +148,7 @@ DoDeleteNetworkInstance.setExceptionFlag(execution)]]> - + #{execution.getVariable("DELNWKI_isSilentSuccess") == true} isReturnCode404_Yes_SequenceFlow @@ -186,9 +162,9 @@ DoDeleteNetworkInstance.setExceptionFlag(execution)]]> isResponseEmptyNo_SequenceFlow SequenceFlow_30 - import org.onap.so.bpmn.infrastructure.scripts.* def deleteNetMod = new DoDeleteNetworkInstance() -deleteNetMod.callRESTQueryAAICloudRegion(execution)]]> +deleteNetMod.callRESTQueryAAICloudRegion(execution) @@ -198,7 +174,7 @@ deleteNetMod.callRESTQueryAAICloudRegion(execution)]]> - + #{execution.getVariable("DELNWKI_isVfRelationshipExist") == true} isRelationshipExistYes_SequenceFlow @@ -210,36 +186,18 @@ deleteNetMod.callRESTQueryAAICloudRegion(execution)]]> SequenceFlow_0r3pvf8 SequenceFlow_1pdp4d2 - import org.onap.so.bpmn.infrastructure.scripts.* def prepareSDNCRequest = new DoDeleteNetworkInstance() -prepareSDNCRequest.prepareSDNCRequest(execution) -]]> +prepareSDNCRequest.prepareSDNCRequest(execution) - - SequenceFlow_2 - SequenceFlow_20 - - - SequenceFlow_30 SequenceFlow_15 - - - - - SequenceFlow_15 - SequenceFlow_2 - import org.onap.so.bpmn.infrastructure.scripts.* def prepareNetworkRequest = new DoDeleteNetworkInstance() -prepareNetworkRequest.sendRequestToVnfAdapter(execution)]]> +prepareNetworkRequest.prepareNetworkRequest(execution) - + SequenceFlow_13 @@ -251,9 +209,9 @@ prepareNetworkRequest.sendRequestToVnfAdapter(execution)]]> SequenceFlow_13 SequenceFlow_17 - import org.onap.so.bpmn.infrastructure.scripts.* def deleteNetMod = new DoDeleteNetworkInstance() -deleteNetMod.processJavaException(execution)]]> +deleteNetMod.processJavaException(execution) @@ -261,15 +219,14 @@ deleteNetMod.processJavaException(execution)]]> sdncTopoDeleteYes_SequenceFlow SequenceFlow_1pbgnr2 - import org.onap.so.bpmn.infrastructure.scripts.* def DoDeleteNetworkInstance = new DoDeleteNetworkInstance() -DoDeleteNetworkInstance.postProcessResponse(execution) -]]> +DoDeleteNetworkInstance.postProcessResponse(execution) - SequenceFlow_20 + Flow_10caop8 SequenceFlow_0r3pvf8 SequenceFlow_0kqnddy @@ -277,10 +234,9 @@ DoDeleteNetworkInstance.postProcessResponse(execution) SequenceFlow_0f13b17 SequenceFlow_0zlbzad - import org.onap.so.bpmn.infrastructure.scripts.* def prepareSDNCRequest = new DoDeleteNetworkInstance() -prepareSDNCRequest.prepareRpcSDNCRequest(execution) -]]> +prepareSDNCRequest.prepareRpcSDNCRequest(execution) @@ -298,23 +254,22 @@ prepareSDNCRequest.prepareRpcSDNCRequest(execution) - + #{execution.getVariable("sdncVersion") != '1610'} SequenceFlow_1 SequenceFlow_0msqfwu - import org.onap.so.bpmn.infrastructure.scripts.* def DoDeleteNetworkInstance = new DoDeleteNetworkInstance() -DoDeleteNetworkInstance.preProcessRequest(execution)]]> +DoDeleteNetworkInstance.preProcessRequest(execution) silentSuccess_SequenceFlow SequenceFlow_0f25bme - import org.onap.so.bpmn.infrastructure.scripts.* def DoDeleteNetworkInstance = new DoDeleteNetworkInstance() -DoDeleteNetworkInstance.postProcessResponse(execution) -]]> +DoDeleteNetworkInstance.postProcessResponse(execution) @@ -333,9 +288,9 @@ DoDeleteNetworkInstance.postProcessResponse(execution) SequenceFlow_0kqnddy SequenceFlow_1o088sy - import org.onap.so.bpmn.infrastructure.scripts.* def DoDeleteNetworkInstance = new DoDeleteNetworkInstance() -DoDeleteNetworkInstance.prepareRpcSDNCDeactivate(execution)]]> +DoDeleteNetworkInstance.prepareRpcSDNCDeactivate(execution) @@ -346,9 +301,9 @@ DoDeleteNetworkInstance.prepareRpcSDNCDeactivate(execution)]]> SequenceFlow_1i3193l SequenceFlow_0n8sf23 - import org.onap.so.bpmn.infrastructure.scripts.* def DoDeleteNetworkInstance = new DoDeleteNetworkInstance() -DoDeleteNetworkInstance.validateRpcSDNCDeactivateResponse(execution)]]> +DoDeleteNetworkInstance.validateRpcSDNCDeactivateResponse(execution) SequenceFlow_08hus4u @@ -359,575 +314,555 @@ DoDeleteNetworkInstance.validateRpcSDNCDeactivateResponse(execution)]]> - + #{execution.getVariable("DELNWKI_sdncResponseSuccess" ) == true} SequenceFlow_08hus4u SequenceFlow_1qyo7ot + + + + + + + SequenceFlow_15 + Flow_10caop8 + + - + - + - - + + - + - + - + - - + + - - - - - + + - + - - + + - + - + - + - - - - + + + + - + - - + + - + - + - + - - + + - + - - + + - + - + - + - + - - - + + + - + - - - - - - - - + - + - + - + - + - - - - + + + + - + - - + + - + - + - + - + - - + + - - - - - - - - + - + - - + + - + - + - - + + - - - - + - + - + - + - - - - + + + + - + - - + + - + - + - - + + - + - + - + - - - - + + + + - + - + - + - + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - + - - - + + + - + - + - + - - + + - - + + - - + + - + - + - - + + - + - - + + - + - + - - - - + + + + - + - + - + - - + + - - + + - - + + - - + + - + - - - + + + - + - + - + - + - + - - - - + + + + - + - - - + + + - + - - - - + - + - - - - + + + + - + - + - - + + - - - + + + - + - - + + - - - - - - - - - + + - + - - + + - - - + + + - \ No newline at end of file + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteNetworkInstanceRollback.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteNetworkInstanceRollback.bpmn deleted file mode 100644 index 7ec02addfa..0000000000 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteNetworkInstanceRollback.bpmn +++ /dev/null @@ -1,547 +0,0 @@ - - - - - SequenceFlow_1krl2dg - - - SequenceFlow_1krl2dg - SequenceFlow_0u41iz2 - - - - - - - - - - - - - - - SequenceFlow_1mxbdps - SequenceFlow_07s5r14 - - - SequenceFlow_0u41iz2 - SequenceFlow_1bb7zpp - SequenceFlow_1mxbdps - - - SequenceFlow_1xokvq6 - SequenceFlow_1xs882r - SequenceFlow_1ucaagl - - - - - - - - - SequenceFlow_1ucaagl - - - - - SequenceFlow_0xktw7v - SequenceFlow_0soe5t3 - - - - SequenceFlow_0xktw7v - - - - SequenceFlow_0soe5t3 - - - - - - SequenceFlow_1hcmrh9 - SequenceFlow_1pi168e - SequenceFlow_1xs882r - - - - SequenceFlow_1bb7zpp - SequenceFlow_07s5r14 - SequenceFlow_1yj3542 - SequenceFlow_18e00sw - - - - - - - ${DELNWKIR_rollbackNetworkRequest} - - - - #{BasicAuthHeaderValuePO} - application/xml - - - POST - ${response} - ${statusCode} - - http-connector - - - SequenceFlow_18e00sw - SequenceFlow_1eyt8z2 - - - - - - SequenceFlow_1yj3542 - SequenceFlow_1eyt8z2 - SequenceFlow_1xokvq6 - SequenceFlow_172safw - - - SequenceFlow_172safw - SequenceFlow_1wy1aba - SequenceFlow_1yltkyg - - - - - - - - - - - - - - - - - - - - - - SequenceFlow_1yltkyg - SequenceFlow_1hcmrh9 - - - - - - - - - - - - SequenceFlow_1wy1aba - SequenceFlow_1pi168e - - - - - SequenceFlow_1s5yjuu - - - SequenceFlow_01hh1wq - SequenceFlow_1s5yjuu - - - - SequenceFlow_01hh1wq - - - - - - - SequenceFlow_0b0m3o7 - - - - SequenceFlow_141226w - - - - - - SequenceFlow_141226w - SequenceFlow_0b0m3o7 - - - - SequenceFlow_1lr1613 - - - - SequenceFlow_0np0b8p - - - - SequenceFlow_1lr1613 - SequenceFlow_0np0b8p - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModule.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModule.bpmn index 6026fc84b3..e08ffbde2f 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModule.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModule.bpmn @@ -1,12 +1,12 @@ - + SequenceFlow_0fp1wqz SequenceFlow_28 - import org.onap.so.bpmn.infrastructure.scripts.* def dvm = new DoDeleteVfModule() -dvm.prepUpdateAAIVfModule(execution)]]> +dvm.prepUpdateAAIVfModule(execution) @@ -30,7 +30,7 @@ dvm.prepUpdateAAIVfModule(execution)]]> SequenceFlow_029ioyr SequenceFlow_14xn858 - + @@ -48,22 +48,22 @@ dvm.prepUpdateAAIVfModule(execution)]]> SequenceFlow_14xn858 SequenceFlow_4 - import org.onap.so.bpmn.infrastructure.scripts.* def dvm = new DoDeleteVfModule() -dvm.prepVNFAdapterRequest(execution)]]> +dvm.prepVNFAdapterRequest(execution) SequenceFlow_31 SequenceFlow_32 - import org.onap.so.bpmn.infrastructure.scripts.* def dvm = new DoDeleteVfModule() -dvm.prepSDNCAdapterRequest(execution, "delete")]]> +dvm.prepSDNCAdapterRequest(execution, "delete") - + - + @@ -88,33 +88,33 @@ dvm.prepSDNCAdapterRequest(execution, "delete")]]> SequenceFlow_2 SequenceFlow_34 - import org.onap.so.bpmn.infrastructure.scripts.* def dvm = new DoDeleteVfModule() -dvm.prepDeleteAAIVfModule(execution)]]> +dvm.prepDeleteAAIVfModule(execution) SequenceFlow_33 SequenceFlow_2 - import org.onap.so.bpmn.infrastructure.scripts.* def dvm = new DoDeleteVfModule() -dvm.sdncValidateResponse(execution, DoDVfMod_doDeleteVfModuleResponse)]]> +dvm.sdncValidateResponse(execution, DoDVfMod_doDeleteVfModuleResponse) SequenceFlow_1 SequenceFlow_12 - import org.onap.so.bpmn.infrastructure.scripts.* def dvm = new DoDeleteVfModule() -dvm.preProcessRequest(execution)]]> +dvm.preProcessRequest(execution) SequenceFlow_12 SequenceFlow_42 - import org.onap.so.bpmn.infrastructure.scripts.* def dvm = new DoDeleteVfModule() -dvm.preProcessRequest(execution)]]> +dvm.preProcessRequest(execution) @@ -125,16 +125,16 @@ dvm.preProcessRequest(execution)]]> SequenceFlow_0coa90m SequenceFlow_08g02ch - import org.onap.so.bpmn.infrastructure.scripts.* def dvm = new DoDeleteVfModule() -dvm.deleteNetworkPoliciesFromAAI(execution)]]> +dvm.deleteNetworkPoliciesFromAAI(execution) SequenceFlow_1xruki1 SequenceFlow_0coa90m - import org.onap.so.bpmn.infrastructure.scripts.* def dvm = new DoDeleteVfModule() -dvm.postProcessVNFAdapterRequest(execution)]]> +dvm.postProcessVNFAdapterRequest(execution) @@ -144,7 +144,7 @@ dvm.postProcessVNFAdapterRequest(execution)]]> - + execution.getVariable("DoDVfMod_oamManagementV4Address") != null || execution.getVariable("DoDVfMod_oamManagementV6Address") != null @@ -158,9 +158,9 @@ dvm.postProcessVNFAdapterRequest(execution)]]> SequenceFlow_1yehsyc SequenceFlow_1a7lzhz - import org.onap.so.bpmn.infrastructure.scripts.* def doDeleteVfModule = new DoDeleteVfModule() -doDeleteVfModule.prepUpdateAAIGenericVnf(execution)]]> +doDeleteVfModule.prepUpdateAAIGenericVnf(execution) @@ -177,11 +177,11 @@ doDeleteVfModule.prepUpdateAAIGenericVnf(execution)]]> SequenceFlow_42 SequenceFlow_029ioyr - import org.onap.so.bpmn.infrastructure.scripts.* def dvm = new DoDeleteVfModule() -dvm.queryAAIVfModuleForStatus(execution)]]> +dvm.queryAAIVfModuleForStatus(execution) - + @@ -189,240 +189,240 @@ dvm.queryAAIVfModuleForStatus(execution)]]> - + - + - - + + - + - + - - + + - + - - + + - + - + - - + + - + - + - + - + - - - - - + + + + + - - - - + + + + - - + + - - + + - + - - + + - - - + + + - - - + + + - + - - + + - + - + - - - - - - + + + + + + - + - + - - + + - - - + + + - + - - - - + + + + - + - - + + - + - - - + + + - - + + - + - + - - + + - + - - + + - - - - - - + + + + + + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModuleFromVnf.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModuleFromVnf.bpmn index 918964f8f8..2dcf79ec8b 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModuleFromVnf.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModuleFromVnf.bpmn @@ -1,5 +1,5 @@ - + @@ -19,22 +19,22 @@ SequenceFlow_0kx9e3s SequenceFlow_4 - import org.onap.so.bpmn.infrastructure.scripts.* def ddvmfv = new DoDeleteVfModuleFromVnf() -ddvmfv.prepVNFAdapterRequest(execution)]]> +ddvmfv.prepVNFAdapterRequest(execution) SequenceFlow_0ltm4jt SequenceFlow_32 - import org.onap.so.bpmn.infrastructure.scripts.* def ddvmfv = new DoDeleteVfModuleFromVnf() -ddvmfv.preProcessSDNCUnassignRequest(execution)]]> +ddvmfv.preProcessSDNCUnassignRequest(execution) - + - + @@ -48,33 +48,33 @@ ddvmfv.preProcessSDNCUnassignRequest(execution)]]> SequenceFlow_33 SequenceFlow_2 - import org.onap.so.bpmn.infrastructure.scripts.* def ddvmfv = new DoDeleteVfModuleFromVnf() String response = execution.getVariable("DDVMFV_deactivateSDNCAdapterResponse") -ddvmfv.validateSDNCResponse(execution, response, "unassign")]]> +ddvmfv.validateSDNCResponse(execution, response, "unassign") SequenceFlow_1 SequenceFlow_0qbjihn - import org.onap.so.bpmn.infrastructure.scripts.* def ddvmfv = new DoDeleteVfModuleFromVnf() -ddvmfv.preProcessRequest(execution)]]> +ddvmfv.preProcessRequest(execution) SequenceFlow_0coa90m SequenceFlow_0ltm4jt - import org.onap.so.bpmn.infrastructure.scripts.* def ddvmfv = new DoDeleteVfModuleFromVnf() -ddvmfv.deleteNetworkPoliciesFromAAI(execution)]]> +ddvmfv.deleteNetworkPoliciesFromAAI(execution) SequenceFlow_0hia88a SequenceFlow_0coa90m - import org.onap.so.bpmn.infrastructure.scripts.* def ddvmfv = new DoDeleteVfModuleFromVnf() -ddvmfv.postProcessVNFAdapterRequest(execution)]]> +ddvmfv.postProcessVNFAdapterRequest(execution) @@ -88,9 +88,9 @@ ddvmfv.postProcessVNFAdapterRequest(execution)]]> SequenceFlow_1igsfgk SequenceFlow_0y4td40 - import org.onap.so.bpmn.infrastructure.scripts.* def ddvmfv = new DoDeleteVfModuleFromVnf() -ddvmfv.preProcessSDNCDeactivateRequest(execution)]]> +ddvmfv.preProcessSDNCDeactivateRequest(execution) @@ -108,27 +108,27 @@ ddvmfv.preProcessSDNCDeactivateRequest(execution)]]> SequenceFlow_12q2r4i SequenceFlow_0kx9e3s - import org.onap.so.bpmn.infrastructure.scripts.* def ddvmfv = new DoDeleteVfModuleFromVnf() String response = execution.getVariable("DDVMFV_deactivateSDNCAdapterResponse") -ddvmfv.validateSDNCResponse(execution, response, "deactivate")]]> +ddvmfv.validateSDNCResponse(execution, response, "deactivate") SequenceFlow_0qbjihn SequenceFlow_1c2lvlc - import org.onap.so.bpmn.infrastructure.scripts.* def ddvmfv = new DoDeleteVfModuleFromVnf() -ddvmfv.queryAAIForVfModule(execution)]]> +ddvmfv.queryAAIForVfModule(execution) SequenceFlow_1c2lvlc SequenceFlow_1igsfgk - import org.onap.so.bpmn.infrastructure.scripts.* def ddvmfv = new DoDeleteVfModuleFromVnf() -ddvmfv.validateVfModule(execution)]]> +ddvmfv.validateVfModule(execution) @@ -141,9 +141,9 @@ ddvmfv.validateVfModule(execution)]]> SequenceFlow_095634c SequenceFlow_0yvjvhu - import org.onap.so.bpmn.common.scripts.* ExceptionUtil ex = new ExceptionUtil() -ex.processJavaException(execution)]]> +ex.processJavaException(execution) @@ -161,9 +161,9 @@ ex.processJavaException(execution)]]> SequenceFlow_2 SequenceFlow_092kvy3 - import org.onap.so.bpmn.infrastructure.scripts.* def ddvmfv = new DoDeleteVfModuleFromVnf() -ddvmfv.prepDeleteAAIVfModule(execution)]]> +ddvmfv.prepDeleteAAIVfModule(execution) @@ -174,218 +174,218 @@ ddvmfv.prepDeleteAAIVfModule(execution)]]> - + - - + + - + - + - + - + - - + + - - + + - + - - - + + + - + - - - - + + + + - + - + - - + + - + - - - - + + + + - - + + - - + + - - - - - - + + + + + + - - - - - - + + + + + + - + - + - + - - + + - - + + - + - - - - - - + + + + + + - + - + - + - + - + - - + + - - + + - + - + - - + + - - + + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModuleVolumeV2.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModuleVolumeV2.bpmn index e7706c20e6..6a44a117c1 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModuleVolumeV2.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModuleVolumeV2.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_1gvfdp4 @@ -7,27 +7,27 @@ SequenceFlow_1vy2ojp SequenceFlow_1dlcqmc - import org.onap.so.bpmn.infrastructure.scripts.* def delVfModuleVol = new DoDeleteVfModuleVolumeV2() -delVfModuleVol.executeMethod('callRESTQueryAAICloudRegion', execution, isDebugLogEnabled)]]> +delVfModuleVol.executeMethod('callRESTQueryAAICloudRegion', execution, isDebugLogEnabled) SequenceFlow_1dlcqmc SequenceFlow_1kjccf1 - import org.onap.so.bpmn.infrastructure.scripts.* def deleteVfMod = new DoDeleteVfModuleVolumeV2() -deleteVfMod.executeMethod('callRESTQueryAAIForVolumeGroup', execution, isDebugLogEnabled)]]> +deleteVfMod.executeMethod('callRESTQueryAAIForVolumeGroup', execution, isDebugLogEnabled) SequenceFlow_1kjccf1 SequenceFlow_1tgngf7 - import org.onap.so.bpmn.infrastructure.scripts.* def deleteVfMod = new DoDeleteVfModuleVolumeV2() -deleteVfMod.executeMethod('prepareVnfAdapterDeleteRequest', execution, isDebugLogEnabled)]]> +deleteVfMod.executeMethod('prepareVnfAdapterDeleteRequest', execution, isDebugLogEnabled) - + - + @@ -40,9 +40,9 @@ deleteVfMod.executeMethod('prepareVnfAdapterDeleteRequest', execution, isDebugLo SequenceFlow_04zsr0f SequenceFlow_13c3cv2 - import org.onap.so.bpmn.infrastructure.scripts.* def deleteVfMod = new DoDeleteVfModuleVolumeV2() -deleteVfMod.executeMethod('callRESTDeleteAAIVolumeGroup', execution, isDebugLogEnabled)]]> +deleteVfMod.executeMethod('callRESTDeleteAAIVolumeGroup', execution, isDebugLogEnabled) SequenceFlow_1sgtwr2 @@ -53,19 +53,19 @@ deleteVfMod.executeMethod('callRESTDeleteAAIVolumeGroup', execution, isDebugLogE SequenceFlow_1gvfdp4 SequenceFlow_1vy2ojp - import org.onap.so.bpmn.infrastructure.scripts.* def deleteVfMod = new DoDeleteVfModuleVolumeV2() deleteVfMod.executeMethod('preProcessRequest', execution, isDebugLogEnabled) -]]> + SequenceFlow_13c3cv2 SequenceFlow_1sgtwr2 - import org.onap.so.bpmn.infrastructure.scripts.* def deleteVfMod = new DoDeleteVfModuleVolumeV2() -deleteVfMod.executeMethod('postProcess', execution, isDebugLogEnabled)]]> +deleteVfMod.executeMethod('postProcess', execution, isDebugLogEnabled) @@ -102,22 +102,22 @@ deleteVfMod.executeMethod('postProcess', execution, isDebugLogEnabled)]]> - - + + - - + + - - + + @@ -126,15 +126,15 @@ deleteVfMod.executeMethod('postProcess', execution, isDebugLogEnabled)]]> - - + + - - + + @@ -143,22 +143,22 @@ deleteVfMod.executeMethod('postProcess', execution, isDebugLogEnabled)]]> - - + + - - + + - - + + 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 b82b1da951..ede63eafac 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 @@ -8,18 +8,18 @@ SequenceFlow_32 SequenceFlow_11 - import org.onap.so.bpmn.infrastructure.scripts.* def DoUpdateNetworkInstance = new DoUpdateNetworkInstance() DoUpdateNetworkInstance.prepareSDNCRequest(execution) -]]> + SequenceFlow_12 SequenceFlow_5 - import org.onap.so.bpmn.infrastructure.scripts.* def DoUpdateNetworkInstance = new DoUpdateNetworkInstance() -DoUpdateNetworkInstance.validateSDNCResponse(execution)]]> +DoUpdateNetworkInstance.validateSDNCResponse(execution) SequenceFlow_5 @@ -28,7 +28,7 @@ DoUpdateNetworkInstance.validateSDNCResponse(execution)]]> - + #{execution.getVariable("UPDNETI_sdncResponseSuccess" ) == true} @@ -59,9 +59,9 @@ DoUpdateNetworkInstance.validateSDNCResponse(execution)]]> SequenceFlow_46 SequenceFlow_29 - import org.onap.so.bpmn.infrastructure.scripts.* def DoUpdateNetworkInstance = new DoUpdateNetworkInstance() -DoUpdateNetworkInstance.postProcessResponse(execution)]]> +DoUpdateNetworkInstance.postProcessResponse(execution) @@ -71,7 +71,7 @@ DoUpdateNetworkInstance.postProcessResponse(execution)]]> isRollbackOn_NoNetwork_SequenceFlow - + #{execution.getVariable("UPDNETI_rollbackEnabled") == true} @@ -85,7 +85,7 @@ DoUpdateNetworkInstance.postProcessResponse(execution)]]> isPONR_No_SequenceFlow - + #{execution.getVariable("UPDNETI_isPONR") == true} @@ -94,15 +94,15 @@ DoUpdateNetworkInstance.postProcessResponse(execution)]]> sdncOk_No_ExclusiveGateway - + #{execution.getVariable("UPDNETI_isSdncRollbackNeeded" ) == true} sdncOk_Yeso_ExclusiveGateway SequenceFlow_53 - import org.onap.so.bpmn.infrastructure.scripts.* def DoUpdateNetworkInstance = new DoUpdateNetworkInstance() -DoUpdateNetworkInstance.prepareSDNCRollbackRequest(execution)]]> +DoUpdateNetworkInstance.prepareSDNCRollbackRequest(execution) @@ -117,37 +117,17 @@ DoUpdateNetworkInstance.prepareSDNCRollbackRequest(execution)]]> SequenceFlow_47 - SequenceFlow_0qr4es6 - import org.onap.so.bpmn.infrastructure.scripts.* def DoUpdateNetworkInstance = new DoUpdateNetworkInstance() -DoUpdateNetworkInstance.prepareRollbackData(execution)]]> +DoUpdateNetworkInstance.prepareRollbackData(execution) - - - - - - - - - - - - - - - - - SequenceFlow_0qr4es6 - SequenceFlow_0ze5k6c SequenceFlow_04rdjfi - import org.onap.so.bpmn.infrastructure.scripts.* def DoUpdateNetworkInstance = new DoUpdateNetworkInstance() -DoUpdateNetworkInstance.postProcessResponse(execution)]]> +DoUpdateNetworkInstance.postProcessResponse(execution) - SequenceFlow_0nrc66n @@ -155,14 +135,14 @@ DoUpdateNetworkInstance.postProcessResponse(execution)]]> - + #{execution.getVariable("sdncVersion") != '1610'} SequenceFlow_23 SequenceFlow_053re4q - import org.onap.so.bpmn.infrastructure.scripts.* def DoUpdateNetworkInstance = new DoUpdateNetworkInstance() -DoUpdateNetworkInstance.setExceptionFlag(execution)]]> +DoUpdateNetworkInstance.setExceptionFlag(execution) @@ -172,24 +152,21 @@ DoUpdateNetworkInstance.setExceptionFlag(execution)]]> SequenceFlow_0ze5k6c - Note: Rollback is not needed for UpdateNetwork, - - - SequenceFlow_13 + Flow_1eutzkj SequenceFlow_35 - import org.onap.so.bpmn.infrastructure.scripts.* def DoUpdateNetworkInstance = new DoUpdateNetworkInstance() -DoUpdateNetworkInstance.callRESTReQueryAAINetworkId(execution)]]> +DoUpdateNetworkInstance.callRESTReQueryAAINetworkId(execution) SequenceFlow_35 SequenceFlow_46 - import org.onap.so.bpmn.infrastructure.scripts.* def DoUpdateNetworkInstance = new DoUpdateNetworkInstance() -DoUpdateNetworkInstance.callRESTUpdateContrailAAINetwork(execution)]]> +DoUpdateNetworkInstance.callRESTUpdateContrailAAINetwork(execution) @@ -199,9 +176,9 @@ DoUpdateNetworkInstance.callRESTUpdateContrailAAINetwork(execution)]]> SequenceFlow_10 SequenceFlow_14 - import org.onap.so.bpmn.infrastructure.scripts.* def DoUpdateNetworkInstance = new DoUpdateNetworkInstance() -DoUpdateNetworkInstance.processJavaException(execution)]]> +DoUpdateNetworkInstance.processJavaException(execution) @@ -216,570 +193,518 @@ DoUpdateNetworkInstance.processJavaException(execution)]]> SequenceFlow_1 SequenceFlow_7 - import org.onap.so.bpmn.infrastructure.scripts.* def DoUpdateNetworkInstance = new DoUpdateNetworkInstance() DoUpdateNetworkInstance.preProcessRequest(execution) -]]> + SequenceFlow_24 SequenceFlow_32 - import org.onap.so.bpmn.infrastructure.scripts.* def DoUpdateNetworkInstance = new DoUpdateNetworkInstance() -DoUpdateNetworkInstance.callRESTQueryAAICloudRegion(execution)]]> +DoUpdateNetworkInstance.callRESTQueryAAICloudRegion(execution) SequenceFlow_3 SequenceFlow_24 - import org.onap.so.bpmn.infrastructure.scripts.* def DoUpdateNetworkInstance = new DoUpdateNetworkInstance() -DoUpdateNetworkInstance.callRESTQueryAAINetworkId(execution)]]> +DoUpdateNetworkInstance.callRESTQueryAAINetworkId(execution) - - SequenceFlow_59 - SequenceFlow_13 - - - - - - - - ${UPDNETI_updateNetworkRequest} - - - - #{BasicAuthHeaderValuePO} - application/xml - - - PUT - ${statusCode} - ${response} - - http-connector - - - SequenceFlow_61 - SequenceFlow_59 - - SequenceFlow_2 SequenceFlow_61 - import org.onap.so.bpmn.infrastructure.scripts.* def DoUpdateNetworkInstance = new DoUpdateNetworkInstance() DoUpdateNetworkInstance.prepareUpdateNetworkRequest(execution) -]]> + - + SequenceFlow_38 SequenceFlow_2 - import org.onap.so.bpmn.infrastructure.scripts.* def DoUpdateNetworkInstance = new DoUpdateNetworkInstance() -DoUpdateNetworkInstance.callRESTQueryAAINetworkTableRef(execution)]]> +DoUpdateNetworkInstance.callRESTQueryAAINetworkTableRef(execution) sdncTopoYes_SequenceFlow SequenceFlow_6 - import org.onap.so.bpmn.infrastructure.scripts.* def DoUpdateNetworkInstance = new DoUpdateNetworkInstance() -DoUpdateNetworkInstance.callRESTReQueryAAINetworkId(execution)]]> +DoUpdateNetworkInstance.callRESTReQueryAAINetworkId(execution) SequenceFlow_6 SequenceFlow_15 - import org.onap.so.bpmn.infrastructure.scripts.* def DoUpdateNetworkInstance = new DoUpdateNetworkInstance() -DoUpdateNetworkInstance.callRESTQueryAAINetworkVpnBinding(execution)]]> +DoUpdateNetworkInstance.callRESTQueryAAINetworkVpnBinding(execution) SequenceFlow_15 SequenceFlow_38 - import org.onap.so.bpmn.infrastructure.scripts.* def DoUpdateNetworkInstance = new DoUpdateNetworkInstance() -DoUpdateNetworkInstance.callRESTQueryAAINetworkPolicy(execution)]]> +DoUpdateNetworkInstance.callRESTQueryAAINetworkPolicy(execution) SequenceFlow_7 SequenceFlow_3 - import org.onap.so.bpmn.infrastructure.scripts.* def DoUpdateNetworkInstance = new DoUpdateNetworkInstance() -DoUpdateNetworkInstance.getServiceInstance(execution)]]> +DoUpdateNetworkInstance.getServiceInstance(execution) + + + + + + + SequenceFlow_61 + Flow_1eutzkj + + - + - + - + - - + + - - - - - - - + - + - + - + - + - + - - + + - + - - - + + + - + - + - + - + - + - - + + - - + + - - + + - - - - + + + + - + - - + + - - + + - + - + - + - - + + - - + + - + - + - - + + - - - - - - - - + - - - + + + - + - + - - + + - + - - - + + + - + - + - - + + - + - + - + - - - - + + + + - + - - - - + + + + - + - + - + - - + + - + - - - + + + - + - + - + - + - - + + - + - - - + + + - + - - + + - - + + - - - - - - - - - - + - + - + - + - - + + - - + + - - - - - - - + + + + + + + - - + + - + - - + + - + - - - - + + + + - - - - + - + - - - - - - - - - + + + + - + - + - - + + - + - - - + + + - + - + - - + + - + - - - + + - - - - - - - - + + + + + + + + + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateNetworkInstanceRollback.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateNetworkInstanceRollback.bpmn deleted file mode 100644 index 9d37d8084e..0000000000 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateNetworkInstanceRollback.bpmn +++ /dev/null @@ -1,374 +0,0 @@ - - - - - SequenceFlow_1krl2dg - - - SequenceFlow_1krl2dg - SequenceFlow_0u41iz2 - - - - - - - - - ${UPDNETIR_rollbackNetworkRequest} - - - - #{BasicAuthHeaderValuePO} - application/xml - - - PUT - ${statusCode} - ${response} - - http-connector - - - SequenceFlow_0e1uixp - SequenceFlow_17o4w67 - - - SequenceFlow_0u41iz2 - SequenceFlow_0e1uixp - SequenceFlow_1lteduj - - - - - - - - - - - - SequenceFlow_101y57s - SequenceFlow_0790olb - - - SequenceFlow_0virkpu - SequenceFlow_101y57s - SequenceFlow_0mw0dgd - - - SequenceFlow_0qc4v9t - SequenceFlow_0el8yzs - SequenceFlow_0yto4gz - - - - SequenceFlow_1lteduj - SequenceFlow_17o4w67 - SequenceFlow_0virkpu - SequenceFlow_0qc4v9t - - - - - - - - - - - - - - - SequenceFlow_0yto4gz - - - - - - SequenceFlow_0xktw7v - SequenceFlow_0soe5t3 - - - - SequenceFlow_0xktw7v - - - - SequenceFlow_0soe5t3 - - - - - - SequenceFlow_0790olb - SequenceFlow_0mw0dgd - SequenceFlow_0el8yzs - - - - - - SequenceFlow_07kf49j - SequenceFlow_01syg1x - - - - SequenceFlow_07kf49j - - - - SequenceFlow_01syg1x - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateVfModule.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateVfModule.bpmn index cfda2ad73c..d423ae5cba 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateVfModule.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateVfModule.bpmn @@ -1,13 +1,13 @@ - + - + This flow expects its incoming request to be in the variable 'DoUpdateVfModuleRequest'. This flow produces no output. SequenceFlow_38 SequenceFlow_2 - import org.onap.so.bpmn.infrastructure.scripts.* def duvm = new DoUpdateVfModule() -duvm.prepPrepareUpdateAAIVfModule(execution)]]> +duvm.prepPrepareUpdateAAIVfModule(execution) @@ -26,18 +26,18 @@ duvm.prepPrepareUpdateAAIVfModule(execution)]]> SequenceFlow_1 SequenceFlow_38 - import org.onap.so.bpmn.infrastructure.scripts.* def duvm = new DoUpdateVfModule() -duvm.preProcessRequest(execution)]]> +duvm.preProcessRequest(execution) SequenceFlow_6 SequenceFlow_35 - import org.onap.so.bpmn.infrastructure.scripts.* def duvm = new DoUpdateVfModule() -duvm.handleWorkflowException(execution)]]> +duvm.handleWorkflowException(execution) SequenceFlow_35 @@ -63,9 +63,9 @@ duvm.handleWorkflowException(execution)]]> SequenceFlow_9 SequenceFlow_18 SequenceFlow_25 - import org.onap.so.bpmn.infrastructure.scripts.* def duvm = new DoUpdateVfModule() -duvm.prepUpdateAAIVfModule(execution)]]> +duvm.prepUpdateAAIVfModule(execution) @@ -83,9 +83,9 @@ duvm.prepUpdateAAIVfModule(execution)]]> SequenceFlow_26 SequenceFlow_27 - import org.onap.so.bpmn.infrastructure.scripts.* def duvm = new DoUpdateVfModule() -duvm.prepSDNCTopologyAct(execution)]]> +duvm.prepSDNCTopologyAct(execution) @@ -104,9 +104,9 @@ duvm.prepSDNCTopologyAct(execution)]]> SequenceFlow_24 SequenceFlow_13 - import org.onap.so.bpmn.infrastructure.scripts.* def duvm = new DoUpdateVfModule() -duvm.prepUpdateAAIGenericVnf(execution)]]> +duvm.prepUpdateAAIGenericVnf(execution) @@ -128,7 +128,7 @@ duvm.prepUpdateAAIGenericVnf(execution)]]> - + ${execution.getVariable('DOUPVfMod_skipUpdateGenericVnf')} == true SequenceFlow_1 @@ -138,9 +138,9 @@ duvm.prepUpdateAAIGenericVnf(execution)]]> SequenceFlow_16 SequenceFlow_17 SequenceFlow_12 - import org.onap.so.bpmn.infrastructure.scripts.* def duvm = new DoUpdateVfModule() -duvm.prepSDNCTopologyChg(execution)]]> +duvm.prepSDNCTopologyChg(execution) @@ -156,9 +156,9 @@ duvm.prepSDNCTopologyChg(execution)]]> SequenceFlow_12 SequenceFlow_3 - + - + @@ -171,18 +171,18 @@ duvm.prepSDNCTopologyChg(execution)]]> SequenceFlow_23 SequenceFlow_21 - import org.onap.so.bpmn.infrastructure.scripts.* def duvm = new DoUpdateVfModule() -duvm.prepVnfAdapterRest(execution)]]> +duvm.prepVnfAdapterRest(execution) SequenceFlow_22 SequenceFlow_23 - import org.onap.so.bpmn.infrastructure.scripts.* String response = execution.getVariable("DOUPVfMod_sdncTopologyResponse") def duvm = new DoUpdateVfModule() -duvm.validateSDNCResponse(execution, response, "query")]]> +duvm.validateSDNCResponse(execution, response, "query") @@ -200,19 +200,19 @@ duvm.validateSDNCResponse(execution, response, "query")]]> SequenceFlow_3 SequenceFlow_5 - import org.onap.so.bpmn.infrastructure.scripts.* String response = execution.getVariable("DOUPVfMod_sdncChangeAssignResponse") def duvm = new DoUpdateVfModule() -duvm.validateSDNCResponse(execution, response, "changeassign")]]> +duvm.validateSDNCResponse(execution, response, "changeassign") SequenceFlow_5 SequenceFlow_19 - import org.onap.so.bpmn.infrastructure.scripts.* def duvm = new DoUpdateVfModule() -duvm.prepSDNCTopologyQuery(execution)]]> +duvm.prepSDNCTopologyQuery(execution) @@ -241,9 +241,9 @@ duvm.prepSDNCTopologyQuery(execution)]]> SequenceFlow_10 SequenceFlow_11 - import org.onap.so.bpmn.infrastructure.scripts.* def duvm = new DoUpdateVfModule() -duvm.prepConfirmVolumeGroupTenant(execution)]]> +duvm.prepConfirmVolumeGroupTenant(execution) @@ -252,18 +252,18 @@ duvm.prepConfirmVolumeGroupTenant(execution)]]> SequenceFlow_16 - + ${execution.getVariable('DOUPVfMod_volumeGroupId').isEmpty()} == false - + execution.getVariable("DOUPVfMod_isBaseVfModule") == "true" SequenceFlow_30 SequenceFlow_34 - import org.onap.so.bpmn.infrastructure.scripts.* def doUpdateVfModule = new DoUpdateVfModule() -doUpdateVfModule.queryAAIVfModule(execution)]]> +doUpdateVfModule.queryAAIVfModule(execution) @@ -277,16 +277,16 @@ doUpdateVfModule.queryAAIVfModule(execution)]]> SequenceFlow_7 SequenceFlow_20 - import org.onap.so.bpmn.infrastructure.scripts.* String response = execution.getVariable("DOUPVfMod_sdncActivateResponse") def duvm = new DoUpdateVfModule() -duvm.validateSDNCResponse(execution, response, "activate")]]> +duvm.validateSDNCResponse(execution, response, "activate") SequenceFlow_20 SequenceFlow_4 - + // This variable is checked by the unit test +execution.setVariable('DoUpdateVfModuleSuccessIndicator', true) @@ -299,369 +299,369 @@ execution.setVariable('DoUpdateVfModuleSuccessIndicator', true)]]> - + - + - + - - + + - + - - + + - + - - + + - + - + - + - - - - + + + + - + - + - - + + - + - + - + - - + + - - - - + + + + - + - - - - - + + + + + - + - - + + - + - + - - + + - + - + - - - - + + + + - - + + - + - + - - + + - - + + - + - + - + - + - + - - + + - + - + - - + + - + - - + + - + - - + + - + - + - - + + - - - - + + + + - + - + - - + + - + - - - + + + - + - + - + - - + + - - + + - - + + - - + + - + - + - + - + - - - - + + + + - - + + - + - - + + - - - + + + - + - - - - + + + + - + - - + + - - + + -- cgit 1.2.3-korg