From 8ec591cda17c9c56ec59128f186083bbfaa7f08e Mon Sep 17 00:00:00 2001 From: c00149107 Date: Fri, 10 Nov 2017 13:48:29 +0800 Subject: Fix AAI Service Delete failed issue. Fix AAI Service Delete failed issue. Change-Id: Ief3eae52d119fcf488a562916d1322641078983f Issue-ID:SO-329 Signed-off-by: c00149107 --- .../scripts/DoCustomDeleteE2EServiceInstance.groovy | 5 ----- .../scripts/DoDeleteVFCNetworkServiceInstance.groovy | 10 +++++----- 2 files changed, 5 insertions(+), 10 deletions(-) (limited to 'bpmn/MSOInfrastructureBPMN/src/main/groovy/org') 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 6026dc4ef9..ffd8372913 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 @@ -330,11 +330,6 @@ public class DoCustomDeleteE2EServiceInstance extends AbstractServiceTaskProcess else { utils.log("INFO", "SI Data" + siData, isDebugEnabled) - serviceType = utils.getNodeText1(siData,"service-type") - execution.setVariable("serviceType", serviceType) - execution.setVariable("serviceRole", utils.getNodeText1(siData,"service-role")) - String orchestrationStatus = utils.getNodeText1(siData,"orchestration-status") - //Confirm there are no related service instances (vnf/network or volume) if (utils.nodeExists(siData, "relationship-list")) { utils.log("INFO", "SI Data relationship-list exists:", 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 b5ceb7a803..b94db498bb 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 @@ -108,7 +108,7 @@ public class DoDeleteVFCNetworkServiceInstance extends AbstractServiceTaskProces String url = host + vfcUrl + "/ns/" + execution.getVariable("nsInstanceId") APIResponse apiResponse = deleteRequest(execution, url, nsOperationKey) String returnCode = apiResponse.getStatusCode() - String aaiResponseAsString = apiResponse.getResponseBodyAsString() + String apiResponseAsString = apiResponse.getResponseBodyAsString() String operationStatus = "error"; if(returnCode== "200"){ operationStatus = "finished" @@ -146,14 +146,14 @@ public class DoDeleteVFCNetworkServiceInstance extends AbstractServiceTaskProces String jobId = execution.getVariable("jobId") String nsOperationKey = execution.getVariable("nsOperationKey"); String url = host + vfcUrl + "/jobs/" + execution.getVariable("jobId") - APIResponse createRsp = postRequest(execution, url, nsOperationKey) + APIResponse apiResponse = postRequest(execution, url, nsOperationKey) String returnCode = apiResponse.getStatusCode() - String aaiResponseAsString = apiResponse.getResponseBodyAsString() + String apiResponseAsString = apiResponse.getResponseBodyAsString() String operationProgress = "100" if(returnCode== "200"){ - operationProgress = jsonUtil.getJsonValue(aaiResponseAsString, "responseDescriptor.progress") + operationProgress = jsonUtil.getJsonValue(apiResponseAsString, "responseDescriptor.progress") } - exection.setVariable("operationProgress", operationProgress) + execution.setVariable("operationProgress", operationProgress) utils.log("INFO", " *** queryNSProgress end *** ", isDebugEnabled) } -- cgit 1.2.3-korg