From 1be6641f0226ac67d6414ec5a39c1bbb872cf225 Mon Sep 17 00:00:00 2001 From: c00149107 Date: Tue, 7 Nov 2017 16:04:40 +0800 Subject: Fix AAI Relationship read failed in delete flow Fix AAI Relationship read failed in delete flow Change-Id: Ieb31f2088aba3d4bb2d4ad5c72aec061cf833069 Issue-ID:SO-311 Signed-off-by: c00149107 --- .../src/main/resources/process/DeleteCustomE2EServiceInstance.bpmn | 3 ++- .../main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'bpmn/MSOInfrastructureBPMN/src/main/resources') diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteCustomE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteCustomE2EServiceInstance.bpmn index c6a6d02e4c..bc2b95c5fe 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteCustomE2EServiceInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteCustomE2EServiceInstance.bpmn @@ -34,8 +34,9 @@ ex.processJavaException(execution)]]> - + + SequenceFlow_0zf2qyk SequenceFlow_07hrbs0 diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn index ecdfd628bb..897fffff95 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn @@ -182,7 +182,7 @@ ddsi.preInitResourcesOperStatus(execution)]]> application/soap+xml - #{BasicAuthHeaderValueDB} + Basic QlBFTENsaWVudDpwYXNzd29yZDEk ${CVFMI_initResOperStatusRequest} @@ -207,6 +207,8 @@ ddsi.preInitResourcesOperStatus(execution)]]> + + SequenceFlow_11e6bfy SequenceFlow_188ejvu -- cgit 1.2.3-korg From d6b6b333748752d72dcdb4bf30c177625ccd6933 Mon Sep 17 00:00:00 2001 From: c00149107 Date: Tue, 7 Nov 2017 16:45:30 +0800 Subject: Fix issue of Class name wrong Fix issue of Class name wrong Change-Id: I47e5be10aed7f991088c99ec7baf3135783c40e2 Issue-ID:SO-312 Signed-off-by: c00149107 --- .../bpmn/infrastructure/scripts/DeleteCustomE2EServiceInstance.groovy | 1 + .../infrastructure/scripts/DoCustomDeleteE2EServiceInstance.groovy | 4 ++-- .../infrastructure/scripts/DoDeleteVFCNetworkServiceInstance.groovy | 4 ++-- .../src/main/resources/process/DeleteCustomE2EServiceInstance.bpmn | 1 + .../main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) (limited to 'bpmn/MSOInfrastructureBPMN/src/main/resources') diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteCustomE2EServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteCustomE2EServiceInstance.groovy index 88eccf07f6..49e4cc9257 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteCustomE2EServiceInstance.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteCustomE2EServiceInstance.groovy @@ -105,6 +105,7 @@ public class DeleteCustomE2EServiceInstance extends AbstractServiceTaskProcessor operationId = UUID.randomUUID().toString() } execution.setVariable("operationId", operationId) + execution.setVariable("operationType", "DELETE") execution.setVariable("URN_mso_adapters_openecomp_db_endpoint","http://mso.mso.testlab.openecomp.org:8080/dbadapters/RequestsDbAdapter") diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCustomDeleteE2EServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCustomDeleteE2EServiceInstance.groovy index a84a7edec2..6026dc4ef9 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCustomDeleteE2EServiceInstance.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCustomDeleteE2EServiceInstance.groovy @@ -280,7 +280,7 @@ public class DoCustomDeleteE2EServiceInstance extends AbstractServiceTaskProcess utils.log("INFO"," ***** postProcessSDNC " + method + " *****", isDebugEnabled) String msg = "" - try { + /*try { WorkflowException workflowException = execution.getVariable("WorkflowException") boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator") utils.log("INFO", "SDNCResponse: " + response, isDebugEnabled) @@ -302,7 +302,7 @@ public class DoCustomDeleteE2EServiceInstance extends AbstractServiceTaskProcess msg = "Exception in postProcessSDNC " + method + " Exception:" + ex.getMessage() utils.log("INFO", msg, isDebugEnabled) exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg) - } + }*/ utils.log("INFO"," *** Exit postProcessSDNC " + method + " ***", isDebugEnabled) } diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVFCNetworkServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVFCNetworkServiceInstance.groovy index 29c78fb238..996173ead5 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVFCNetworkServiceInstance.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVFCNetworkServiceInstance.groovy @@ -41,10 +41,10 @@ import org.openecomp.mso.rest.RESTConfig import org.openecomp.mso.rest.APIResponse; /** - * This groovy class supports the DODeleteVFCNetworkServiceInstance.bpmn process. + * This groovy class supports the DoDeleteVFCNetworkServiceInstance.bpmn process. * flow for E2E ServiceInstance Delete */ -public class DODeleteVFCNetworkServiceInstance extends AbstractServiceTaskProcessor { +public class DoDeleteVFCNetworkServiceInstance extends AbstractServiceTaskProcessor { String deleteUrl = "/vfc/vfcadapters/v1/ns/{nsInstanceId}" diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteCustomE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteCustomE2EServiceInstance.bpmn index bc2b95c5fe..2983589699 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteCustomE2EServiceInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteCustomE2EServiceInstance.bpmn @@ -37,6 +37,7 @@ ex.processJavaException(execution)]]> + SequenceFlow_0zf2qyk SequenceFlow_07hrbs0 diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn index 897fffff95..e39db56ee8 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn @@ -66,7 +66,7 @@ ex.processJavaException(execution)]]> - + @@ -129,7 +129,7 @@ def ddsi = new DoCustomDeleteE2EServiceInstance() ddsi.preResourceDelete(execution, resourceName )]]> - + -- cgit 1.2.3-korg