diff options
| author |   Seshu Kumar M <seshu.kumar.m@huawei.com> | 2017-11-10 06:31:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-11-10 06:31:34 +0000 |
| commit | 7131f923020c859da684d16d8af276e17bcec1cd (patch) | |
| tree | c40faa6d386bdf1a1416598d457a7b3facc06cbc /bpmn/MSOInfrastructureBPMN/src/main/groovy/org | |
| parent | e795d55a244458a8705760e06a24747cc014cfd3 (diff) | |
| parent | 8ec591cda17c9c56ec59128f186083bbfaa7f08e (diff) | |
Merge "Fix AAI Service Delete failed issue."
Diffstat (limited to 'bpmn/MSOInfrastructureBPMN/src/main/groovy/org')
2 files changed, 5 insertions, 10 deletions
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)
}
|