diff options
Diffstat (limited to 'bpmn/MSOInfrastructureBPMN/src/main')
3 files changed, 9 insertions, 14 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)
}
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn index 461af11061..10e49a198b 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn @@ -18,7 +18,7 @@ ddsi.preProcessRequest(execution) <bpmn:callActivity id="CallActivity_06izbke" name="Call AAI GenericDelete Service " calledElement="GenericDeleteService"> <bpmn:extensionElements> <camunda:in source="serviceInstanceId" target="GENDS_serviceInstanceId" /> - <camunda:in source="subscriptionServiceType" target="GENDS_serviceType" /> + <camunda:in source="serviceType" target="GENDS_serviceType" /> <camunda:in source="globalSubscriberId" target="GENDS_globalCustomerId" /> <camunda:in sourceExpression="service-instance" target="GENDS_type" /> <camunda:out source="GENDS_FoundIndicator" target="GENDS_FoundIndicator" /> @@ -70,10 +70,10 @@ ex.processJavaException(execution)]]></bpmn:script> <bpmn:extensionElements> <camunda:in source="globalSubscriberId" target="globalSubscriberId" /> <camunda:in source="serviceType" target="serviceType" /> - <camunda:in source="serviceId" target="serviceId" /> + <camunda:in source="serviceInstanceId" target="serviceId" /> <camunda:in source="operationId" target="operationId" /> - <camunda:in source="resouceTemplateUUID" target="resouceTemplateUUID" /> - <camunda:in source="resouceInstanceId" target="resouceInstanceId" /> + <camunda:in source="resourceTemplateId" target="resourceTemplateId" /> + <camunda:in source="resourceInstanceId" target="resourceInstanceId" /> <camunda:in source="resourceType" target="resourceType" /> <camunda:in source="operationType" target="operationType" /> </bpmn:extensionElements> |