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 --- .../onap/so/client/exception/ExceptionBuilder.java | 2 +- .../resources/subprocess/OpenstackAdapterTask.bpmn | 336 +++++++++++++++++++++ .../main/resources/subprocess/VnfAdapterTask.bpmn | 336 --------------------- 3 files changed, 337 insertions(+), 337 deletions(-) create mode 100644 bpmn/MSOCommonBPMN/src/main/resources/subprocess/OpenstackAdapterTask.bpmn delete mode 100644 bpmn/MSOCommonBPMN/src/main/resources/subprocess/VnfAdapterTask.bpmn (limited to 'bpmn/MSOCommonBPMN/src/main') diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/exception/ExceptionBuilder.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/exception/ExceptionBuilder.java index 30fd2c8770..4455c9fe9d 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/exception/ExceptionBuilder.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/exception/ExceptionBuilder.java @@ -329,7 +329,7 @@ public class ExceptionBuilder { } } - public void processVnfAdapterException(DelegateExecution execution) { + public void processOpenstackAdapterException(DelegateExecution execution) { StringBuilder workflowExceptionMessage = new StringBuilder(); logger.debug("Processing Vnf Adapter Exception"); try { diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/OpenstackAdapterTask.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/OpenstackAdapterTask.bpmn new file mode 100644 index 0000000000..e437f13d7b --- /dev/null +++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/OpenstackAdapterTask.bpmn @@ -0,0 +1,336 @@ + + + + + SequenceFlow_13uy51h + + + SequenceFlow_9 + + + + SequenceFlow_9 + SequenceFlow_1ff2y8j + + + + SequenceFlow_1p39f4r + SequenceFlow_0ecut35 + + + + SequenceFlow_0ecut35 + SequenceFlow_13uy51h + SequenceFlow_0o8wnkx + + + #{execution.getVariable("OpenstackPollSuccess") == true } + + + #{execution.getVariable("OpenstackPollSuccess") == false } + + + SequenceFlow_1ff2y8j + SequenceFlow_1p39f4r + SequenceFlow_007m32h + + + #{execution.getVariable("OpenstackInvokeSuccess") == true } + + + #{execution.getVariable("OpenstackInvokeSuccess") == false } + + + + SequenceFlow_02rhau9 + + + + SequenceFlow_0y1by9x + SequenceFlow_006myq9 + + + + SequenceFlow_006myq9 + SequenceFlow_1ubla93 + SequenceFlow_1piwh1c + + + + + SequenceFlow_1ubla93 + SequenceFlow_1nku4uk + + + SequenceFlow_1piwh1c + SequenceFlow_1nku4uk + SequenceFlow_1yx80cq + + + SequenceFlow_1yx80cq + SequenceFlow_1az3a2q + SequenceFlow_0bnzfqb + + + #{execution.getVariable("PollRollbackStatus") == true} + + + + + + + SequenceFlow_0bnzfqb + + + + SequenceFlow_02rhau9 + SequenceFlow_0y1by9x + SequenceFlow_1az3a2q + + + #{execution.getVariable("backout") == true } + + + + + + + + + SequenceFlow_007m32h + + + + SequenceFlow_0o8wnkx + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/VnfAdapterTask.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/VnfAdapterTask.bpmn deleted file mode 100644 index 69b68e534e..0000000000 --- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/VnfAdapterTask.bpmn +++ /dev/null @@ -1,336 +0,0 @@ - - - - - SequenceFlow_13uy51h - - - SequenceFlow_9 - - - - SequenceFlow_9 - SequenceFlow_1ff2y8j - - - - SequenceFlow_1p39f4r - SequenceFlow_0ecut35 - - - - SequenceFlow_0ecut35 - SequenceFlow_13uy51h - SequenceFlow_0o8wnkx - - - - - - - - - SequenceFlow_1ff2y8j - SequenceFlow_1p39f4r - SequenceFlow_007m32h - - - - - - - - - - SequenceFlow_02rhau9 - - - - SequenceFlow_0y1by9x - SequenceFlow_006myq9 - - - - SequenceFlow_006myq9 - SequenceFlow_1ubla93 - SequenceFlow_1piwh1c - - - - - SequenceFlow_1ubla93 - SequenceFlow_1nku4uk - - - SequenceFlow_1piwh1c - SequenceFlow_1nku4uk - SequenceFlow_1yx80cq - - - SequenceFlow_1yx80cq - SequenceFlow_1az3a2q - SequenceFlow_0bnzfqb - - - - - - - - - - SequenceFlow_0bnzfqb - - - - SequenceFlow_02rhau9 - SequenceFlow_0y1by9x - SequenceFlow_1az3a2q - - - - - - - - - - - - SequenceFlow_007m32h - - - - SequenceFlow_0o8wnkx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit 1.2.3-korg