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 ++++++++++----------- 1 file changed, 307 insertions(+), 344 deletions(-) (limited to 'bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn') 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 + - + - + - + - + - + - - + + - + - - - + + + - + - - - - + + + + - + - - - - + - + - + - + - + - + - - + + - + - - + + - + - + - + - + - - + + - - + + - - + + - + - - - - + + + + - + - + - - + + - + - - + + - + - - + + - + - + - + - + - - + + - + - - - - + + + + - - - - + + + + - - - - - - - - - - + - - - - - + + + - + - - + + - + - + - - - + + + - + - - + + - + - + - + - - - - + + + + - + - - - + + + - + - + - - - + + + - + - - + + - + - - - + + + - + - + - + - + - - + + - - + + - - - + + + - + - - - - + + + + - - - - + + + + - + - - - - + + + + - + - + - - - - + + + + - + - - + + - + - + - + - + - + - - + + - - + + - - + + - - + + - + - - + + - + - + - + - - - + + + - + - + - + - + - - + + - + - - - + + + - + - + - + - - - + + + - + - - + + - + - + - - + + - - + + - + - + - - + + - + - - - + + + - + - + - + - - + + - + - - - + + + - + - + - + - + - + - + - + - - - - + + + + - + - + - - + + - + - - - - + + + + - + - - + + - - + + - - - + + + - - + + - + - - + + - + - - + + - + - + - - + + - + - - + + - + - + - - + + - + - - + + - + - - + + - + - - - + + + - - - - - - - - + - - + + - + - - + + - + + + + + + + + -- cgit 1.2.3-korg