diff options
22 files changed, 708 insertions, 263 deletions
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/DeleteVfModuleResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/DeleteVfModuleResponse.java index aacb4d64f0..c5b8bb7d59 100644 --- a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/DeleteVfModuleResponse.java +++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/DeleteVfModuleResponse.java @@ -35,7 +35,7 @@ public class DeleteVfModuleResponse extends VfResponseCommon { private String vnfId; private String vfModuleId; private Boolean vfModuleDeleted; - private Map<String,String> vfModuleOutputs = new HashMap<String, String>(); + private Map<String,String> vfModuleOutputs = new HashMap<>(); public DeleteVfModuleResponse() { super(); } diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/VfResponseCommon.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/VfResponseCommon.java index 4a902bdd83..76cbda1ef4 100644 --- a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/VfResponseCommon.java +++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/VfResponseCommon.java @@ -58,7 +58,7 @@ public abstract class VfResponseCommon { public String toJsonString() { try { - String jsonString = null; + String jsonString; ObjectMapper mapper = new ObjectMapper(); mapper.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE); jsonString = mapper.writeValueAsString(this); diff --git a/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/VolumeAdapterRest.java b/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/VolumeAdapterRest.java index 87b48fc68a..a8250fc35b 100644 --- a/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/VolumeAdapterRest.java +++ b/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/VolumeAdapterRest.java @@ -462,7 +462,6 @@ public class VolumeAdapterRest { LOGGER.debug("UpdateVNFVolumesTask start"); try { @SuppressWarnings("unused") - Holder<String> stackId = new Holder<> (); Holder<Map<String, String>> outputs = new Holder<> (); Holder<VnfRollback> vnfRollback = new Holder<> (); String completeVnfVfModuleType = req.getVnfType() + "::" + req.getVfModuleType(); diff --git a/adapters/mso-workflow-message-adapter/src/main/java/org/openecomp/mso/adapters/workflowmessage/BPRestCallback.java b/adapters/mso-workflow-message-adapter/src/main/java/org/openecomp/mso/adapters/workflowmessage/BPRestCallback.java index 0293a8d4d0..20880c24a6 100644 --- a/adapters/mso-workflow-message-adapter/src/main/java/org/openecomp/mso/adapters/workflowmessage/BPRestCallback.java +++ b/adapters/mso-workflow-message-adapter/src/main/java/org/openecomp/mso/adapters/workflowmessage/BPRestCallback.java @@ -132,7 +132,7 @@ public class BPRestCallback { httpResponse = client.execute(method); @SuppressWarnings("unused") - String responseContent = null; + String responseContent; if (httpResponse.getEntity() != null) { responseContent = EntityUtils.toString(httpResponse.getEntity(), "UTF-8"); @@ -175,4 +175,4 @@ public class BPRestCallback { LOGGER.info(MessageEnum.RA_CALLBACK_BPEL_COMPLETE, "Camunda", ""); } } -}
\ No newline at end of file +} diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateCustomE2EServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateCustomE2EServiceInstance.groovy index 2fda530843..73066b3722 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateCustomE2EServiceInstance.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateCustomE2EServiceInstance.groovy @@ -337,4 +337,5 @@ public class CreateCustomE2EServiceInstance extends AbstractServiceTaskProcessor } utils.log("DEBUG", "======== COMPLETED prepareInitServiceOperationStatus Process ======== ", isDebugEnabled) } + }
\ No newline at end of file diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy index 7505eed348..a2be3035a6 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy @@ -179,7 +179,7 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor { execution.setVariable("modelVersion", modelVersion) execution.setVariable("modelUuid", modelUuid) execution.setVariable("modelName", modelName) - + StringBuilder sbParams = new StringBuilder() Map<String, String> paramsMap = execution.getVariable("serviceInputParams") if (paramsMap != null) @@ -619,7 +619,7 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor { String progress = "0" String reason = "" String operationContent = "Prepare service creation" - utils.log("DEBUG", "Generated new operation for Service Instance serviceId:" + serviceId + " operationId:" + operationId, isDebugEnabled) + utils.log("DEBUG", "Generated new operation for Service Instance serviceId:" + serviceId + " operationId:" + operationId + " operationType:" + oprationType, isDebugEnabled) serviceId = UriUtils.encode(serviceId,"UTF-8") execution.setVariable("serviceInstanceId", serviceId) execution.setVariable("operationId", operationId) @@ -666,4 +666,35 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor { utils.log("DEBUG", "======== COMPLETED preInitResourcesOperStatus Process ======== ", isDebugEnabled) } + /** + * prepare resource create request + */ + public void preResourceRequest(execution, resourceType){ + def isDebugEnabled=execution.getVariable("isDebugLogEnabled") + String serviceInstanceName = execution.getVariable("serviceInstanceName") + String nsServiceName = nsName + "_" + serviceInstanceName + String nsServiceDescription = execution.getVariable("serviceInstanceDescription") + execution.setVariable("nsServiceName", nsServiceName) + utils.log("DEBUG", "Prepare VFC Request nsServiceName:" + nsServiceName, isDebugEnabled) + execution.setVariable("nsServiceDescription", nsServiceDescription) + utils.log("DEBUG", "Prepare VFC Request nsServiceDescription:" + nsServiceDescription, isDebugEnabled) + String globalSubscriberId = execution.getVariable("globalSubscriberId") + String serviceType = execution.getVariable("serviceType") + String serviceId = execution.getVariable("serviceId") + String operationId = execution.getVariable("operationId") + String incomingRequest = execution.getVariable("bpmnRequest") + Map serviceReq = jsonSlurper.parseText(incomingRequest) + def segmentList = serviceReq.service.parameters.segments + if (segmentList != null) { + segmentList.each { + if(StringUtils.containsIgnoreCase(it.resourceName, resourceType)){ + String resourceUUID = it.resourceUUID + String resourceParameters = it.nsParameters + execution.setVariable("resourceType", resourceType) + execution.setVariable("resourceUUID", resourceUUID) + execution.setVariable("resourceParameters", resourceParameters) + } + } + } + } } diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy index b346faf4c6..6c0dedfe78 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy @@ -80,7 +80,7 @@ public class DoCreateVFCNetworkServiceInstance extends AbstractServiceTaskProces utils.log("DEBUG", "serviceId:" + serviceId, isDebugEnabled)
String operationId = execution.getVariable("operationId")
utils.log("DEBUG", "serviceType:" + serviceType, isDebugEnabled)
- String nodeTemplateUUID = execution.getVariable("nodeTemplateUUID")
+ String nodeTemplateUUID = execution.getVariable("resourceUUID")
utils.log("DEBUG", "nodeTemplateUUID:" + nodeTemplateUUID, isDebugEnabled)
/*
* segmentInformation needed as a object of segment
@@ -93,13 +93,13 @@ public class DoCreateVFCNetworkServiceInstance extends AbstractServiceTaskProces * }
* }
*/
- String siRequest = execution.getVariable("segmentInformation")
+ String nsParameters = execution.getVariable("resourceParamters")
utils.log("DEBUG", "Input Request:" + siRequest, isDebugEnabled)
String nsOperationKey = "{\"globalSubscriberId\":\"" + globalSubscriberId + "\",\"serviceType:\""
+ serviceType + "\",\"serviceId\":\"" + serviceId + "\",\"operationId\":\"" + operationId
+"\",\"nodeTemplateUUID\":\"" + nodeTemplateUUID + "\"}";
execution.setVariable("nsOperationKey", nsOperationKey);
- execution.setVariable("nsParameters", jsonUtil.getJsonValue(siRequest, "nsParameters"))
+ execution.setVariable("nsParameters", nsParameters)
} catch (BpmnError e) {
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 041ff62aca..b7aaef097a 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 @@ -473,4 +473,123 @@ public class DoDeleteE2EServiceInstance extends AbstractServiceTaskProcessor { } utils.log("DEBUG"," *** Exit postProcessAAIDEL *** ", isDebugEnabled) } + + public void preInitResourcesOperStatus(Execution execution){ + def isDebugEnabled = execution.getVariable("isDebugLogEnabled") + + utils.log("DEBUG", " ======== STARTED preInitResourcesOperStatus Process ======== ", isDebugEnabled) + try{ + String serviceId = execution.getVariable("serviceInstanceId") + String operationId = execution.getVariable("operationId") + String operationType = execution.getVariable("operationType") + String resourceTemplateUUIDs = "" + String result = "processing" + String progress = "0" + String reason = "" + String operationContent = "Prepare service creation" + utils.log("DEBUG", "Generated new operation for Service Instance serviceId:" + serviceId + " operationId:" + operationId + " operationType:" + oprationType, isDebugEnabled) + serviceId = UriUtils.encode(serviceId,"UTF-8") + execution.setVariable("serviceInstanceId", serviceId) + execution.setVariable("operationId", operationId) + execution.setVariable("operationType", operationType) + // we use resource instance ids for delete flow as resourceTemplateUUIDs + /*[ + { + "resourceInstanceId":"1111", + "resourceType":"vIMS" + }, + { + "resourceInstanceId":"222", + "resourceType":"vEPC" + }, + { + "resourceInstanceId":"3333", + "resourceType":"overlay" + }, + { + "resourceInstanceId":"4444", + "resourceType":"underlay" + } + ]*/ + String serviceRelationShip = execution.getVariable("serviceRelationShip") + + def jsonSlurper = new JsonSlurper() + def jsonOutput = new JsonOutput() + List relationShipList = jsonSlurper.parseText(serviceRelationShip) + + if (relationShipList != null) { + relationShipList.each { + resourceTemplateUUIDs = resourceTemplateUUIDs + it.resourceInstanceId + ":" + } + } + + def dbAdapterEndpoint = execution.getVariable("URN_mso_openecomp_adapters_db_endpoint") + execution.setVariable("CVFMI_dbAdapterEndpoint", dbAdapterEndpoint) + utils.log("DEBUG", "DB Adapter Endpoint is: " + dbAdapterEndpoint, isDebugEnabled) + + String payload = + """<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" + xmlns:ns="http://org.openecomp.mso/requestsdb"> + <soapenv:Header/> + <soapenv:Body> + <ns:initResourceOperationStatus xmlns:ns="http://org.openecomp.mso/requestsdb"> + <serviceId>${serviceId}</serviceId> + <operationId>${operationId}</operationId> + <operationType>${operationType}</operationType> + <resourceTemplateUUIDs>${resourceTemplateUUIDs}</resourceTemplateUUIDs> + </ns:initResourceOperationStatus> + </soapenv:Body> + </soapenv:Envelope>""" + + payload = utils.formatXml(payload) + execution.setVariable("CVFMI_initResOperStatusRequest", payload) + utils.log("DEBUG", "Outgoing initResourceOperationStatus: \n" + payload, isDebugEnabled) + utils.logAudit("CreateVfModuleInfra Outgoing initResourceOperationStatus Request: " + payload) + + }catch(Exception e){ + utils.log("ERROR", "Exception Occured Processing preInitResourcesOperStatus. Exception is:\n" + e, isDebugEnabled) + execution.setVariable("CVFMI_ErrorResponse", "Error Occurred during preInitResourcesOperStatus Method:\n" + e.getMessage()) + } + utils.log("DEBUG", "======== COMPLETED preInitResourcesOperStatus Process ======== ", isDebugEnabled) + } + + /** + * prepare delete parameters + */ + public void preResourceDelete(execution, resourceName){ + // we use resource instance ids for delete flow as resourceTemplateUUIDs + /*[ + { + "resourceInstanceId":"1111", + "resourceType":"vIMS" + }, + { + "resourceInstanceId":"222", + "resourceType":"vEPC" + }, + { + "resourceInstanceId":"3333", + "resourceType":"overlay" + }, + { + "resourceInstanceId":"4444", + "resourceType":"underlay" + } + ]*/ + String serviceRelationShip = execution.getVariable("serviceRelationShip") + def jsonSlurper = new JsonSlurper() + def jsonOutput = new JsonOutput() + List relationShipList = jsonSlurper.parseText(serviceRelationShip) + + if (relationShipList != null) { + relationShipList.each { + if(resouceName.equals(it.resouceType)) + String resouceTemplateUUID = it.resourceInstanceId + String resouceInstanceUUID = it.resouceInstanceId + execution.setVariable("resouceTemplateUUID", resouceTemplateUUID) + execution.setVariable("resouceInstanceId", resouceInstanceUUID) + execution.setResourceType("resourceType", resouceName) + } + } + } } 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 f3659ed52c..bec12906ad 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 @@ -75,9 +75,9 @@ public class DODeleteVFCNetworkServiceInstance extends AbstractServiceTaskProces utils.log("DEBUG", "serviceId:" + serviceId, isDebugEnabled)
String operationId = execution.getVariable("operationId")
utils.log("DEBUG", "serviceType:" + serviceType, isDebugEnabled)
- String nodeTemplateUUID = execution.getVariable("nodeTemplateUUID")
+ String nodeTemplateUUID = execution.getVariable("resourceTemplateUUID")
utils.log("DEBUG", "nodeTemplateUUID:" + nodeTemplateUUID, isDebugEnabled)
- String nsInstanceId = execution.getVariable("nsInstanceId")
+ String nsInstanceId = execution.getVariable("resourceInstanceId")
utils.log("DEBUG", "nsInstanceId:" + nsInstanceId, isDebugEnabled)
String nsOperationKey = "{\"globalSubscriberId\":\"" + globalSubscriberId + "\",\"serviceType:\""
+ serviceType + "\",\"serviceId\":\"" + serviceId + "\",\"operationId\":\"" + operationId
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/AbstractSdncOperationTask.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/AbstractSdncOperationTask.java index 0f384096cb..4495e87789 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/AbstractSdncOperationTask.java +++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/AbstractSdncOperationTask.java @@ -22,16 +22,19 @@ package org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask; import org.apache.commons.lang3.StringUtils; import org.camunda.bpm.engine.delegate.DelegateExecution; +import org.json.JSONObject; import org.onap.msb.sdk.httpclient.RestServiceCreater; import org.onap.msb.sdk.httpclient.msb.MSBServiceClient; -import org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.client.GenericResourceApi; import org.openecomp.mso.bpmn.core.BaseTask; +import org.openecomp.mso.bpmn.core.PropertyConfiguration; +import org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.client.GenericResourceApi; import org.openecomp.mso.logger.MessageEnum; import org.openecomp.mso.logger.MsoLogger; import org.openecomp.mso.requestsdb.RequestsDatabase; import org.openecomp.mso.requestsdb.RequestsDbConstant; import org.openecomp.mso.requestsdb.ResourceOperationStatus; +import java.util.HashMap; import java.util.Map; /** @@ -41,7 +44,7 @@ public abstract class AbstractSdncOperationTask extends BaseTask { private static final String DEFAULT_MSB_IP = "127.0.0.1"; private static final int DEFAULT_MSB_Port = 10081; - private static final String SDCADAPTOR_INPUTS = "SDCADAPTOR_INPUTS"; + private static final String SDCADAPTOR_INPUTS = "resourceParameters"; private RequestsDatabase requestsDB = RequestsDatabase.getInstance(); @@ -51,7 +54,7 @@ public abstract class AbstractSdncOperationTask extends BaseTask { public void execute(DelegateExecution execution) { GenericResourceApi genericResourceApiClient = getGenericResourceApiClient(execution); updateProgress(execution, RequestsDbConstant.Status.PROCESSING, null, "10", "execute begin!"); - Map<String, String> inputs = (Map<String, String>) execution.getVariable(SDCADAPTOR_INPUTS); + Map<String, String> inputs = getInputs(execution); updateProgress(execution, null, null, "30", "getGenericResourceApiClient finished!"); try { sendRestrequestAndHandleResponse(execution, inputs, genericResourceApiClient); @@ -63,6 +66,15 @@ public abstract class AbstractSdncOperationTask extends BaseTask { } } + protected Map<String, String> getInputs(DelegateExecution execution) { + Map<String, String> inputs = new HashMap<>(); + String json = (String) execution.getVariable(SDCADAPTOR_INPUTS); + JSONObject jsonObject = new JSONObject(json); + JSONObject paras = jsonObject.getJSONObject("additionalParamForNs"); + paras.keySet().stream().forEach(key -> inputs.put(key, paras.getString((String) key))); + return inputs; + } + public abstract void sendRestrequestAndHandleResponse(DelegateExecution execution, Map<String, String> inputs, GenericResourceApi genericResourceApiClient) throws Exception; @@ -93,15 +105,16 @@ public abstract class AbstractSdncOperationTask extends BaseTask { private GenericResourceApi getGenericResourceApiClient(DelegateExecution execution) { updateProgress(execution, null, null, "20", "getGenericResourceApiClient begin!"); - String msbIp = getString(execution, "MSB_IP", DEFAULT_MSB_IP); - int msbPort = getInteger(execution, "MSB_Port", DEFAULT_MSB_Port); + Map<String, String> properties = PropertyConfiguration.getInstance().getProperties("mso.bpmn.urn.properties"); + String msbIp = getString(properties, "msb.address", DEFAULT_MSB_IP); + int msbPort = Integer.valueOf(getString(properties, "msb.port", String.valueOf(DEFAULT_MSB_Port))); MSBServiceClient msbClient = new MSBServiceClient(msbIp, msbPort); RestServiceCreater restServiceCreater = new RestServiceCreater(msbClient); return restServiceCreater.createService(GenericResourceApi.class); } - private String getString(DelegateExecution execution, String name, String defaultValue) { - String vlaue = (String) execution.getVariable(name); + private String getString(Map<String, String> properties, String name, String defaultValue) { + String vlaue = properties.get(name); try { if (!StringUtils.isBlank(vlaue)) { return vlaue; diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncServiceTopologyOperationTask.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncServiceTopologyOperationTask.java index b5f312d71f..d6ccc8b03b 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncServiceTopologyOperationTask.java +++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/SdncServiceTopologyOperationTask.java @@ -40,9 +40,12 @@ public class SdncServiceTopologyOperationTask extends AbstractSdncOperationTask public void sendRestrequestAndHandleResponse(DelegateExecution execution, Map<String, String> inputs, GenericResourceApi genericResourceApiClient) throws Exception { + updateProgress(execution, null, null, "40", "sendRestrequestAndHandleResponse begin!"); ServiceRpcInputEntityBuilder builder = new ServiceRpcInputEntityBuilder(); RpcServiceTopologyOperationInputEntity inputEntity = builder.build(execution, inputs); + updateProgress(execution, null, null, "50", "RequestBody build finished!"); RpcServiceTopologyOperationOutputEntity outputEntity = genericResourceApiClient.postServiceTopologyOperation(inputEntity).execute().body(); + updateProgress(execution, null, null, "90", "sendRestrequestAndHandleResponse finished!"); saveOutput(execution, outputEntity); } diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/builder/AbstractBuilder.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/builder/AbstractBuilder.java index 41fa8f250a..0634da7264 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/builder/AbstractBuilder.java +++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/builder/AbstractBuilder.java @@ -22,7 +22,6 @@ package org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.client.builde import org.apache.commons.lang3.StringUtils; import org.camunda.bpm.engine.delegate.DelegateExecution; -import org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.SdncUnderlayVpnPreprocessTask; import org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.client.entity.OnapModelInformationEntity; import org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.client.entity.ParamEntity; import org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.client.entity.RequestInformationEntity; @@ -41,6 +40,10 @@ import java.util.UUID; * Created by 10112215 on 2017/9/20. */ public abstract class AbstractBuilder<IN, OUT> { + + public static final String OPERATION_TYPE = "operationType"; + public static final String RESOURCE_TYPE = "resourceType"; + public static enum RequestAction { CreateNetworkInstance(0, "CreateNetworkInstance"), ActivateNetworkInstance(1, "ActivateNetworkInstance"), @@ -56,7 +59,9 @@ public abstract class AbstractBuilder<IN, OUT> { CreateContrailRouteInstance(11, "CreateContrailRouteInstance"), DeleteContrailRouteInstance(12, "DeleteContrailRouteInstance"), CreateSecurityZoneInstance(13, "CreateSecurityZoneInstance"), - DeleteSecurityZoneInstance(14, "DeleteSecurityZoneInstance"); + DeleteSecurityZoneInstance(14, "DeleteSecurityZoneInstance"), + ActivateDCINetworkInstance(15, "ActivateDCINetworkInstance"), + DeActivateDCINetworkInstance(16, "DeActivateDCINetworkInstance"); String name; int value; @@ -110,25 +115,55 @@ public abstract class AbstractBuilder<IN, OUT> { protected String getRequestActoin(DelegateExecution execution) { String action = /*RequestInformation.*/RequestAction.CreateNetworkInstance.name(); - String operType = getOperType(execution); + String operType = (String) execution.getVariable(OPERATION_TYPE); + String resourceType = ((String) execution.getVariable(RESOURCE_TYPE)).toLowerCase(); if (!StringUtils.isBlank(operType)) { if (RequestsDbConstant.OperationType.DELETE.equals(operType)) { - action = /*RequestInformation.*/RequestAction.DeleteNetworkInstance.name(); + if (isOverlay(resourceType)) { + action = /*RequestInformation.*/RequestAction.DeActivateDCINetworkInstance.name(); + } else if (isUnderlay(resourceType)) { + action = /*RequestInformation.*/RequestAction.DeleteNetworkInstance.name(); + } else { + action = /*RequestInformation.*/RequestAction.DeleteServiceInstance.name(); + } } else if (RequestsDbConstant.OperationType.CREATE.equals(operType)) { - action = /*RequestInformation.*/RequestAction.CreateNetworkInstance.name(); + if (isOverlay(resourceType)) { + action = /*RequestInformation.*/RequestAction.ActivateDCINetworkInstance.name(); + } else if (isUnderlay(resourceType)) { + action = /*RequestInformation.*/RequestAction.CreateNetworkInstance.name(); + } else { + action = /*RequestInformation.*/RequestAction.CreateServiceInstance.name(); + } } } return action; } - protected String getOperationType(DelegateExecution execution) { + private boolean isOverlay(String resourceType) { + return !StringUtils.isBlank(resourceType) && resourceType.contains("overlay"); + } + + private boolean isUnderlay(String resourceType) { + return !StringUtils.isBlank(resourceType) && resourceType.contains("underlay"); + } + + protected String getSvcAction(DelegateExecution execution) { String action = /*SdncRequestHeader.*/SvcAction.Create.name(); - String operType = getOperType(execution); + String operType = (String) execution.getVariable(OPERATION_TYPE); + String resourceType = ((String) execution.getVariable(RESOURCE_TYPE)).toLowerCase(); if (!StringUtils.isBlank(operType)) { if (RequestsDbConstant.OperationType.DELETE.equals(operType)) { - action = /*SdncRequestHeader.*/SvcAction.Delete.name(); + if (isOverlay(resourceType)) { + action = /*SdncRequestHeader.*/SvcAction.Deactivate.name(); + } else { + action = /*SdncRequestHeader.*/SvcAction.Delete.name(); + } } else if (RequestsDbConstant.OperationType.CREATE.equals(operType)) { - action = /*SdncRequestHeader.*/SvcAction.Create.name(); + if (isOverlay(resourceType)) { + action = /*SdncRequestHeader.*/SvcAction.Activate.name(); + } else { + action = /*SdncRequestHeader.*/SvcAction.Create.name(); + } } } return action; @@ -144,10 +179,6 @@ public abstract class AbstractBuilder<IN, OUT> { return requestId; } - protected String getOperType(DelegateExecution execution) { - return (String) execution.getVariable(SdncUnderlayVpnPreprocessTask.RESOURCE_OPER_TYPE); - } - protected OnapModelInformationEntity getOnapModelInformationEntity(DelegateExecution execution) { OnapModelInformationEntity onapModelInformationEntity = new OnapModelInformationEntity(); { diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/builder/NetworkRpcInputEntityBuilder.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/builder/NetworkRpcInputEntityBuilder.java index a1e47df501..94838ed1ff 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/builder/NetworkRpcInputEntityBuilder.java +++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/builder/NetworkRpcInputEntityBuilder.java @@ -60,7 +60,7 @@ public class NetworkRpcInputEntityBuilder extends AbstractBuilder<Map<String, St SdncRequestHeaderEntity sdncRequestHeaderEntity = new SdncRequestHeaderEntity(); { sdncRequestHeaderEntity.setSvcRequestId(getRequestId(execution)); - sdncRequestHeaderEntity.setSvcAction(getOperationType(execution)); + sdncRequestHeaderEntity.setSvcAction(getSvcAction(execution)); } networkTopologyOperationInputEntity.setSdncRequestHeader(sdncRequestHeaderEntity); } diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/builder/ServiceRpcInputEntityBuilder.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/builder/ServiceRpcInputEntityBuilder.java index 5cb9272564..7867358bb6 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/builder/ServiceRpcInputEntityBuilder.java +++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/builder/ServiceRpcInputEntityBuilder.java @@ -76,7 +76,7 @@ public class ServiceRpcInputEntityBuilder extends AbstractBuilder<Map<String, St SdncRequestHeaderEntity sdncRequestHeaderEntity = new SdncRequestHeaderEntity(); { sdncRequestHeaderEntity.setSvcRequestId(getRequestId(execution)); - sdncRequestHeaderEntity.setSvcAction(getOperationType(execution)); + sdncRequestHeaderEntity.setSvcAction(getSvcAction(execution)); } serviceTopologyOperationInputEntity.setSdncRequestHeader(sdncRequestHeaderEntity); } diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustomE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustomE2EServiceInstance.bpmn index 0a80602705..04b47b452a 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustomE2EServiceInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustomE2EServiceInstance.bpmn @@ -146,9 +146,8 @@ csi.sendSyncResponse(execution)]]></bpmn:script> <bpmn:outgoing>SequenceFlow_1euqjsp</bpmn:outgoing> <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* def csi= new CreateCustomE2EServiceInstance() -csi.InitServiceOperationStatus(execution)]]></bpmn:script> +csi.prepareInitServiceOperationStatus(execution)]]></bpmn:script> </bpmn:scriptTask> - <bpmn:sequenceFlow id="SequenceFlow_081z8l2" sourceRef="Task_19mxcw3" targetRef="ScriptTask_0xupxj9" /> <bpmn:serviceTask id="Task_19mxcw3" name="Update Service Operation Status"> <bpmn:extensionElements> <camunda:connector> @@ -171,21 +170,22 @@ csi.InitServiceOperationStatus(execution)]]></bpmn:script> <bpmn:incoming>SequenceFlow_1euqjsp</bpmn:incoming> <bpmn:outgoing>SequenceFlow_081z8l2</bpmn:outgoing> </bpmn:serviceTask> + <bpmn:sequenceFlow id="SequenceFlow_081z8l2" sourceRef="Task_19mxcw3" targetRef="ScriptTask_0xupxj9" /> </bpmn:process> <bpmn:error id="Error_0nbdy47" name="MSOWorkflowException" errorCode="MSOWorkflowException" /> <bpmndi:BPMNDiagram id="BPMNDiagram_1"> <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="CreateCustomE2EServiceInstance"> <bpmndi:BPMNShape id="StartEvent_00qj6ro_di" bpmnElement="StartEvent_00qj6ro"> - <dc:Bounds x="82" y="180" width="36" height="36" /> + <dc:Bounds x="-6" y="180" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="64" y="221" width="73" height="24" /> + <dc:Bounds x="-24" y="221" width="73" height="24" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="SubProcess_0ka59nc_di" bpmnElement="SubProcess_0ka59nc" isExpanded="true"> <dc:Bounds x="463" y="632" width="394" height="188" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="CallActivity_0rhljy8_di" bpmnElement="DoCreateE2EServiceInstance"> - <dc:Bounds x="701" y="158" width="100" height="80" /> + <dc:Bounds x="751" y="158" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="EndEvent_0bpd6c0_di" bpmnElement="EndEvent_0bpd6c0"> <dc:Bounds x="1258" y="286" width="36" height="36" /> @@ -194,7 +194,7 @@ csi.InitServiceOperationStatus(execution)]]></bpmn:script> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_1s09c7d_di" bpmnElement="ScriptTask_1s09c7d"> - <dc:Bounds x="158" y="158" width="100" height="80" /> + <dc:Bounds x="115" y="158" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_0ttvn8r_di" bpmnElement="ScriptTask_0ttvn8r"> <dc:Bounds x="1038" y="158" width="100" height="80" /> @@ -206,7 +206,7 @@ csi.InitServiceOperationStatus(execution)]]></bpmn:script> <dc:Bounds x="348" y="370" width="679" height="194" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_0xupxj9_di" bpmnElement="ScriptTask_0xupxj9"> - <dc:Bounds x="550" y="158" width="100" height="80" /> + <dc:Bounds x="610" y="158" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ExclusiveGateway_0aqn64l_di" bpmnElement="ExclusiveGateway_0aqn64l" isMarkerVisible="true"> <dc:Bounds x="903" y="173" width="50" height="50" /> @@ -221,24 +221,24 @@ csi.InitServiceOperationStatus(execution)]]></bpmn:script> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0s2spoq_di" bpmnElement="SequenceFlow_0s2spoq"> - <di:waypoint xsi:type="dc:Point" x="118" y="198" /> - <di:waypoint xsi:type="dc:Point" x="158" y="198" /> + <di:waypoint xsi:type="dc:Point" x="30" y="198" /> + <di:waypoint xsi:type="dc:Point" x="115" y="198" /> <bpmndi:BPMNLabel> - <dc:Bounds x="93" y="177" width="90" height="12" /> + <dc:Bounds x="27.5" y="177" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_19eilro_di" bpmnElement="SequenceFlow_19eilro"> - <di:waypoint xsi:type="dc:Point" x="650" y="198" /> - <di:waypoint xsi:type="dc:Point" x="701" y="198" /> + <di:waypoint xsi:type="dc:Point" x="710" y="198" /> + <di:waypoint xsi:type="dc:Point" x="751" y="198" /> <bpmndi:BPMNLabel> - <dc:Bounds x="630.5" y="177" width="90" height="12" /> + <dc:Bounds x="685.5" y="177" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0klbpxx_di" bpmnElement="SequenceFlow_0klbpxx"> - <di:waypoint xsi:type="dc:Point" x="801" y="198" /> + <di:waypoint xsi:type="dc:Point" x="851" y="198" /> <di:waypoint xsi:type="dc:Point" x="903" y="198" /> <bpmndi:BPMNLabel> - <dc:Bounds x="807" y="183" width="0" height="12" /> + <dc:Bounds x="832" y="177" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0yayvrf_di" bpmnElement="SequenceFlow_0yayvrf"> @@ -249,10 +249,10 @@ csi.InitServiceOperationStatus(execution)]]></bpmn:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0z4faf9_di" bpmnElement="SequenceFlow_0z4faf9"> - <di:waypoint xsi:type="dc:Point" x="258" y="198" /> - <di:waypoint xsi:type="dc:Point" x="298" y="198" /> + <di:waypoint xsi:type="dc:Point" x="215" y="198" /> + <di:waypoint xsi:type="dc:Point" x="273" y="198" /> <bpmndi:BPMNLabel> - <dc:Bounds x="233" y="177" width="90" height="12" /> + <dc:Bounds x="199" y="177" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_14zu6wr_di" bpmnElement="SequenceFlow_14zu6wr"> @@ -363,25 +363,25 @@ csi.InitServiceOperationStatus(execution)]]></bpmn:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1euqjsp_di" bpmnElement="SequenceFlow_1euqjsp"> - <di:waypoint xsi:type="dc:Point" x="398" y="198" /> - <di:waypoint xsi:type="dc:Point" x="425.46307385229545" y="198" /> + <di:waypoint xsi:type="dc:Point" x="373" y="198" /> + <di:waypoint xsi:type="dc:Point" x="446" y="198" /> <bpmndi:BPMNLabel> - <dc:Bounds x="411.7315369261477" y="177" width="0" height="12" /> + <dc:Bounds x="364.5" y="177" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_1a3vwas_di" bpmnElement="Task_1tqjch6"> - <dc:Bounds x="298" y="158" width="100" height="80" /> + <dc:Bounds x="273" y="158" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ServiceTask_1afiuuq_di" bpmnElement="Task_19mxcw3"> + <dc:Bounds x="446" y="158" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_081z8l2_di" bpmnElement="SequenceFlow_081z8l2"> - <di:waypoint xsi:type="dc:Point" x="525.4630738522955" y="198" /> - <di:waypoint xsi:type="dc:Point" x="550" y="198" /> + <di:waypoint xsi:type="dc:Point" x="546" y="198" /> + <di:waypoint xsi:type="dc:Point" x="610" y="198" /> <bpmndi:BPMNLabel> - <dc:Bounds x="537.7315369261478" y="177" width="0" height="12" /> + <dc:Bounds x="533" y="177" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="ServiceTask_1afiuuq_di" bpmnElement="Task_19mxcw3"> - <dc:Bounds x="426" y="158" width="100" height="80" /> - </bpmndi:BPMNShape> </bpmndi:BPMNPlane> </bpmndi:BPMNDiagram> </bpmn:definitions> diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn index 2e996e20d5..109cf69b92 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn @@ -127,25 +127,35 @@ def ddsi = new DoCreateE2EServiceInstance() ddsi.postProcessAAIPUT(execution)]]></bpmn2:script> </bpmn2:scriptTask> <bpmn2:sequenceFlow id="SequenceFlow_1dd86x8" sourceRef="ScriptTask_0q37vn9" targetRef="ExclusiveGateway_1nk6aol" /> - <bpmn2:scriptTask id="ScriptTask_0081lne" name="Prepare SDN-C Adaptor Data Request" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_0k4q7jm</bpmn2:incoming> + <bpmn2:scriptTask id="ScriptTask_0081lne" name="Prepare Resource Requst For overlay" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_1pjr82f</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_0ofqw6v</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +String nsName = "overlay" def csi = new DoCreateE2EServiceInstance() -csi.preSDNCRequest(execution)]]></bpmn2:script> +csi.preResourceRequest(execution, nsName)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:scriptTask id="ScriptTask_0wvq4t8" name="Prepare VF-C Adaptor Data Request" scriptFormat="groovy"> + <bpmn2:scriptTask id="ScriptTask_0wvq4t8" name="Prepare Resource Request for vEPC" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_05gdjox</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_15zgrcq</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +String resourceName= "vEPC" def csi = new DoCreateE2EServiceInstance() -csi.preVFCRequest(execution)]]></bpmn2:script> +csi.preResourceRequest(execution, resourceName)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:callActivity id="CallActivity_09c3ajg" name="Call DoCreateE2ENetworkInstance" calledElement="DoCreateE2ENetworkInstance"> - <bpmn2:incoming>SequenceFlow_0ofqw6v</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_1vvdkcs</bpmn2:outgoing> - </bpmn2:callActivity> - <bpmn2:callActivity id="CallActivity_0uwm4l1" name="Call DoCreateVFCNetworkServiceInstance" calledElement="DoCreateVFCNetworkServiceInstance"> + <bpmn2:callActivity id="CallActivity_0uwm4l1" name="Call DoCreateVFCNetworkServiceInstance For vEPC" calledElement="DoCreateVFCNetworkServiceInstance"> + <bpmn2:extensionElements> + <camunda:in source="nsServiceName" target="nsServiceName" /> + <camunda:in source="nsServiceDescription" target="nsServiceDescription" /> + <camunda:in source="globalSubscriberId" target="globalSubscriberId" /> + <camunda:in source="serviceType" target="serviceType" /> + <camunda:in source="serviceId" target="serviceId" /> + <camunda:in source="operationId" target="operationId" /> + <camunda:in source="resourceType" target="resourceType" /> + <camunda:in source="resourceUUID" target="resourceUUID" /> + <camunda:in source="resourceParameters" target="resourceParameters" /> + <camunda:in source="operationType" target="operationType" /> + </bpmn2:extensionElements> <bpmn2:incoming>SequenceFlow_15zgrcq</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_0k4q7jm</bpmn2:outgoing> </bpmn2:callActivity> @@ -164,7 +174,7 @@ csi.postConfigRequest(execution)]]></bpmn2:script> <bpmn2:endEvent id="EndEvent_0kbbt94"> <bpmn2:incoming>SequenceFlow_092ghvu</bpmn2:incoming> </bpmn2:endEvent> - <bpmn2:sequenceFlow id="SequenceFlow_0k4q7jm" sourceRef="CallActivity_0uwm4l1" targetRef="ScriptTask_0081lne" /> + <bpmn2:sequenceFlow id="SequenceFlow_0k4q7jm" sourceRef="CallActivity_0uwm4l1" targetRef="Task_0aidjmp" /> <bpmn2:sequenceFlow id="SequenceFlow_1qctzm0" sourceRef="Task_0uiekmn" targetRef="Task_0raqlqc" /> <bpmn2:scriptTask id="Task_0uiekmn" name="Prepare Resource Oper Status"> <bpmn2:incoming>SequenceFlow_1170ztf</bpmn2:incoming> @@ -196,6 +206,55 @@ ddsi.preInitResourcesOperStatus(execution)]]></bpmn2:script> <bpmn2:incoming>SequenceFlow_1qctzm0</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_05gdjox</bpmn2:outgoing> </bpmn2:serviceTask> + <bpmn2:sequenceFlow id="SequenceFlow_0ua1bbk" sourceRef="Task_0aidjmp" targetRef="Task_03n6y9h" /> + <bpmn2:scriptTask id="Task_0aidjmp" name="Prepare Resource Request For vIMS" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_0k4q7jm</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_0ua1bbk</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +String nsName = "vIMS" +def csi = new DoCreateE2EServiceInstance() +csi.preResourceRequest(execution, nsName)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:sequenceFlow id="SequenceFlow_1hgiln0" sourceRef="Task_03n6y9h" targetRef="Task_0io5qby" /> + <bpmn2:callActivity id="Task_03n6y9h" name="Call DoCreateVFCNetworkServiceInstance For vIMS" calledElement="DoCreateVFCNetworkServiceInstance"> + <bpmn2:extensionElements> + <camunda:in source="nsServiceName" target="nsServiceName" /> + <camunda:in source="nsServiceDescription" target="nsServiceDescription" /> + <camunda:in source="globalSubscriberId" target="globalSubscriberId" /> + <camunda:in source="serviceType" target="serviceType" /> + <camunda:in source="serviceId" target="serviceId" /> + <camunda:in source="operationId" target="operationId" /> + <camunda:in source="resourceType" target="resourceType" /> + <camunda:in source="resourceUUID" target="resourceUUID" /> + <camunda:in source="resourceParameters" target="resourceParameters" /> + <camunda:in source="operationType" target="operationType" /> + </bpmn2:extensionElements> + <bpmn2:incoming>SequenceFlow_0ua1bbk</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_1hgiln0</bpmn2:outgoing> + </bpmn2:callActivity> + <bpmn2:sequenceFlow id="SequenceFlow_1vo0235" sourceRef="Task_0io5qby" targetRef="Task_0pkhzoj" /> + <bpmn2:serviceTask id="Task_0io5qby" name="Call Sync SDNC service Create " camunda:class="org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.SdncServiceTopologyOperationTask"> + <bpmn2:incoming>SequenceFlow_1hgiln0</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_1vo0235</bpmn2:outgoing> + </bpmn2:serviceTask> + <bpmn2:sequenceFlow id="SequenceFlow_17i1ors" sourceRef="Task_0pkhzoj" targetRef="Task_0gs55f1" /> + <bpmn2:sequenceFlow id="SequenceFlow_1pjr82f" sourceRef="Task_0gs55f1" targetRef="ScriptTask_0081lne" /> + <bpmn2:scriptTask id="Task_0pkhzoj" name="Prepare Resource Request For underlay"> + <bpmn2:incoming>SequenceFlow_1vo0235</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_17i1ors</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +String nsName = "underlay" +def csi = new DoCreateE2EServiceInstance() +csi.preResourceRequest(execution, nsName)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:serviceTask id="Task_0gs55f1" name="Call Underlay Create" camunda:class="org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.SdncNetworkTopologyOperationTask"> + <bpmn2:incoming>SequenceFlow_17i1ors</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_1pjr82f</bpmn2:outgoing> + </bpmn2:serviceTask> + <bpmn2:serviceTask id="CallActivity_09c3ajg" name="Call Overlay Create" camunda:class="org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.SdncNetworkTopologyOperationTask"> + <bpmn2:incoming>SequenceFlow_0ofqw6v</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_1vvdkcs</bpmn2:outgoing> + </bpmn2:serviceTask> </bpmn2:process> <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" /> <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" /> @@ -276,35 +335,35 @@ ddsi.preInitResourcesOperStatus(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="SubProcess_06d8lk8_di" bpmnElement="SubProcess_06d8lk8" isExpanded="true"> - <dc:Bounds x="-329" y="412" width="783" height="195" /> + <dc:Bounds x="-155" y="387" width="783" height="195" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="StartEvent_0yljq9y_di" bpmnElement="StartEvent_0yljq9y"> - <dc:Bounds x="-233" y="489" width="36" height="36" /> + <dc:Bounds x="-59" y="464" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="-260" y="530" width="90" height="0" /> + <dc:Bounds x="-86" y="505" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="EndEvent_117lkk3_di" bpmnElement="EndEvent_117lkk3"> - <dc:Bounds x="400" y="489" width="36" height="36" /> + <dc:Bounds x="574" y="464" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="373" y="530" width="90" height="0" /> + <dc:Bounds x="547" y="505" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="CallActivity_1srx6p6_di" bpmnElement="CallActivity_1srx6p6"> - <dc:Bounds x="65" y="467" width="100" height="80" /> + <dc:Bounds x="239" y="442" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0eumzpf_di" bpmnElement="SequenceFlow_0eumzpf"> - <di:waypoint xsi:type="dc:Point" x="165" y="507" /> - <di:waypoint xsi:type="dc:Point" x="233" y="507" /> + <di:waypoint xsi:type="dc:Point" x="339" y="482" /> + <di:waypoint xsi:type="dc:Point" x="407" y="482" /> <bpmndi:BPMNLabel> - <dc:Bounds x="154" y="492" width="90" height="0" /> + <dc:Bounds x="328" y="467" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0tgrn11_di" bpmnElement="SequenceFlow_0tgrn11"> - <di:waypoint xsi:type="dc:Point" x="-197" y="507" /> - <di:waypoint xsi:type="dc:Point" x="-98" y="507" /> + <di:waypoint xsi:type="dc:Point" x="-23" y="482" /> + <di:waypoint xsi:type="dc:Point" x="76" y="482" /> <bpmndi:BPMNLabel> - <dc:Bounds x="-192" y="492" width="90" height="0" /> + <dc:Bounds x="-18" y="467" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ExclusiveGateway_1nk6aol_di" bpmnElement="ExclusiveGateway_1nk6aol" isMarkerVisible="true"> @@ -349,68 +408,65 @@ ddsi.preInitResourcesOperStatus(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_0ocetux_di" bpmnElement="ScriptTask_0ocetux"> - <dc:Bounds x="-98" y="467" width="100" height="80" /> + <dc:Bounds x="76" y="442" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1lqktwf_di" bpmnElement="SequenceFlow_1lqktwf"> - <di:waypoint xsi:type="dc:Point" x="2" y="507" /> - <di:waypoint xsi:type="dc:Point" x="65" y="507" /> + <di:waypoint xsi:type="dc:Point" x="176" y="482" /> + <di:waypoint xsi:type="dc:Point" x="239" y="482" /> <bpmndi:BPMNLabel> - <dc:Bounds x="-11" y="492" width="90" height="0" /> + <dc:Bounds x="163" y="467" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_1p0vyip_di" bpmnElement="ScriptTask_1p0vyip"> - <dc:Bounds x="233" y="467" width="100" height="80" /> + <dc:Bounds x="407" y="442" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1xzgv5k_di" bpmnElement="SequenceFlow_1xzgv5k"> - <di:waypoint xsi:type="dc:Point" x="333" y="507" /> - <di:waypoint xsi:type="dc:Point" x="365" y="507" /> - <di:waypoint xsi:type="dc:Point" x="365" y="507" /> - <di:waypoint xsi:type="dc:Point" x="400" y="507" /> + <di:waypoint xsi:type="dc:Point" x="507" y="482" /> + <di:waypoint xsi:type="dc:Point" x="539" y="482" /> + <di:waypoint xsi:type="dc:Point" x="539" y="482" /> + <di:waypoint xsi:type="dc:Point" x="574" y="482" /> <bpmndi:BPMNLabel> - <dc:Bounds x="335" y="507" width="90" height="0" /> + <dc:Bounds x="509" y="482" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_0081lne_di" bpmnElement="ScriptTask_0081lne"> - <dc:Bounds x="477" y="819" width="100" height="80" /> + <dc:Bounds x="-410" y="819" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_0wvq4t8_di" bpmnElement="ScriptTask_0wvq4t8"> - <dc:Bounds x="848" y="819" width="100" height="80" /> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="CallActivity_09c3ajg_di" bpmnElement="CallActivity_09c3ajg"> - <dc:Bounds x="295" y="819" width="100" height="80" /> + <dc:Bounds x="789" y="819" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="CallActivity_0uwm4l1_di" bpmnElement="CallActivity_0uwm4l1"> <dc:Bounds x="632" y="819" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_1xdjlzm_di" bpmnElement="ScriptTask_1xdjlzm"> - <dc:Bounds x="101" y="819" width="100" height="80" /> + <dc:Bounds x="-741" y="819" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0ofqw6v_di" bpmnElement="SequenceFlow_0ofqw6v"> - <di:waypoint xsi:type="dc:Point" x="477" y="859" /> - <di:waypoint xsi:type="dc:Point" x="395" y="859" /> + <di:waypoint xsi:type="dc:Point" x="-410" y="859" /> + <di:waypoint xsi:type="dc:Point" x="-478" y="859" /> <bpmndi:BPMNLabel> - <dc:Bounds x="391" y="838" width="90" height="12" /> + <dc:Bounds x="-489" y="838" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_15zgrcq_di" bpmnElement="SequenceFlow_15zgrcq"> - <di:waypoint xsi:type="dc:Point" x="848" y="859" /> + <di:waypoint xsi:type="dc:Point" x="789" y="859" /> <di:waypoint xsi:type="dc:Point" x="732" y="859" /> <bpmndi:BPMNLabel> - <dc:Bounds x="745" y="838" width="90" height="12" /> + <dc:Bounds x="715.5" y="838" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1vvdkcs_di" bpmnElement="SequenceFlow_1vvdkcs"> - <di:waypoint xsi:type="dc:Point" x="295" y="859" /> - <di:waypoint xsi:type="dc:Point" x="201" y="859" /> + <di:waypoint xsi:type="dc:Point" x="-578" y="859" /> + <di:waypoint xsi:type="dc:Point" x="-641" y="859" /> <bpmndi:BPMNLabel> - <dc:Bounds x="203" y="838" width="90" height="12" /> + <dc:Bounds x="-654.5" y="838" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_092ghvu_di" bpmnElement="SequenceFlow_092ghvu"> - <di:waypoint xsi:type="dc:Point" x="101" y="859" /> - <di:waypoint xsi:type="dc:Point" x="11" y="859" /> + <di:waypoint xsi:type="dc:Point" x="-741" y="859" /> + <di:waypoint xsi:type="dc:Point" x="-787" y="859" /> <bpmndi:BPMNLabel> - <dc:Bounds x="11" y="838" width="90" height="12" /> + <dc:Bounds x="-809" y="838" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1170ztf_di" bpmnElement="SequenceFlow_1170ztf"> @@ -421,16 +477,16 @@ ddsi.preInitResourcesOperStatus(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="EndEvent_01p249c_di" bpmnElement="EndEvent_0kbbt94"> - <dc:Bounds x="-25" y="841" width="36" height="36" /> + <dc:Bounds x="-823" y="841" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="-143" y="881" width="90" height="12" /> + <dc:Bounds x="-941" y="881" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0k4q7jm_di" bpmnElement="SequenceFlow_0k4q7jm"> <di:waypoint xsi:type="dc:Point" x="632" y="859" /> - <di:waypoint xsi:type="dc:Point" x="577" y="859" /> + <di:waypoint xsi:type="dc:Point" x="596" y="859" /> <bpmndi:BPMNLabel> - <dc:Bounds x="559.5" y="838" width="90" height="12" /> + <dc:Bounds x="569" y="838" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1qctzm0_di" bpmnElement="SequenceFlow_1qctzm0"> @@ -446,7 +502,7 @@ ddsi.preInitResourcesOperStatus(execution)]]></bpmn2:script> <bpmndi:BPMNEdge id="SequenceFlow_05gdjox_di" bpmnElement="SequenceFlow_05gdjox"> <di:waypoint xsi:type="dc:Point" x="1022" y="784" /> <di:waypoint xsi:type="dc:Point" x="1022" y="859" /> - <di:waypoint xsi:type="dc:Point" x="948" y="859" /> + <di:waypoint xsi:type="dc:Point" x="889" y="859" /> <bpmndi:BPMNLabel> <dc:Bounds x="1037" y="815.5" width="0" height="12" /> </bpmndi:BPMNLabel> @@ -454,6 +510,59 @@ ddsi.preInitResourcesOperStatus(execution)]]></bpmn2:script> <bpmndi:BPMNShape id="ServiceTask_14tnuxf_di" bpmnElement="Task_0raqlqc"> <dc:Bounds x="972" y="704" width="100" height="80" /> </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_0ua1bbk_di" bpmnElement="SequenceFlow_0ua1bbk"> + <di:waypoint xsi:type="dc:Point" x="496" y="859" /> + <di:waypoint xsi:type="dc:Point" x="446" y="859" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="471" y="838" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ScriptTask_0ue196s_di" bpmnElement="Task_0aidjmp"> + <dc:Bounds x="496" y="819" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1hgiln0_di" bpmnElement="SequenceFlow_1hgiln0"> + <di:waypoint xsi:type="dc:Point" x="346" y="859" /> + <di:waypoint xsi:type="dc:Point" x="191" y="859" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="268.5" y="838" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="CallActivity_1hcdpgq_di" bpmnElement="Task_03n6y9h"> + <dc:Bounds x="346" y="819" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1vo0235_di" bpmnElement="SequenceFlow_1vo0235"> + <di:waypoint xsi:type="dc:Point" x="91" y="859" /> + <di:waypoint xsi:type="dc:Point" x="46" y="859" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="68.5" y="838" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ServiceTask_0qi8cgg_di" bpmnElement="Task_0io5qby"> + <dc:Bounds x="91" y="819" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_17i1ors_di" bpmnElement="SequenceFlow_17i1ors"> + <di:waypoint xsi:type="dc:Point" x="-54" y="859" /> + <di:waypoint xsi:type="dc:Point" x="-125" y="859" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="-134.5" y="838" width="90" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1pjr82f_di" bpmnElement="SequenceFlow_1pjr82f"> + <di:waypoint xsi:type="dc:Point" x="-225" y="859" /> + <di:waypoint xsi:type="dc:Point" x="-310" y="859" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="-312.5" y="838" width="90" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ScriptTask_0ue4dzp_di" bpmnElement="Task_0pkhzoj"> + <dc:Bounds x="-54" y="819" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ServiceTask_1q727pm_di" bpmnElement="Task_0gs55f1"> + <dc:Bounds x="-225" y="819" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ServiceTask_1cnnn5b_di" bpmnElement="CallActivity_09c3ajg"> + <dc:Bounds x="-578" y="819" width="100" height="80" /> + </bpmndi:BPMNShape> </bpmndi:BPMNPlane> </bpmndi:BPMNDiagram> </bpmn2:definitions> diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn index c354ef6932..91f5404c9b 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.7.2"> +<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.10.0"> <bpmn:process id="DoCustomDeleteE2EServiceInstance" isExecutable="true"> <bpmn:startEvent id="StartEvent_0212h2r" name="Start Flow"> <bpmn:outgoing>SequenceFlow_0vz7cd9</bpmn:outgoing> @@ -26,8 +26,8 @@ ddsi.preProcessRequest(execution) <camunda:out source="GENDS_SuccessIndicator" target="GENDS_SuccessIndicator" /> <camunda:out source="WorkflowException" target="WorkflowExcpeton" /> </bpmn:extensionElements> - <bpmn:incoming>SequenceFlow_0ph3iin</bpmn:incoming> <bpmn:incoming>SequenceFlow_0uhpfcl</bpmn:incoming> + <bpmn:incoming>SequenceFlow_0vg4q7x</bpmn:incoming> <bpmn:outgoing>SequenceFlow_0g6bxqw</bpmn:outgoing> </bpmn:callActivity> <bpmn:exclusiveGateway id="ExclusiveGateway_0c6gz3v" name="SI found in AAI" default="SequenceFlow_0g20hqr"> @@ -98,46 +98,34 @@ ex.processJavaException(execution)]]></bpmn:script> </bpmn:sequenceFlow> <bpmn:sequenceFlow id="SequenceFlow_0g20hqr" name="no" sourceRef="ExclusiveGateway_0c6gz3v" targetRef="EndEvent_0123yz3" /> <bpmn:sequenceFlow id="SequenceFlow_0sj8yc8" sourceRef="CallActivity_0x2ulh3" targetRef="ScriptTask_1rtnsh8" /> - <bpmn:callActivity id="CallActivity_Del_VFC" name="Call Custom Delete VFC" calledElement="CustomVFCDelete"> + <bpmn:callActivity id="CallActivity_Del_VFC" name="Call Network Service Delete for vEPC" calledElement="DODeleteVFCNetworkServiceInstance"> <bpmn:extensionElements> - <camunda:in source="serviceInstanceId" target="GENGS_serviceInstanceId" /> - <camunda:in sourceExpression="service-instance" target="GENGS_type" /> - <camunda:out source="GENGS_FoundIndicator" target="GENGS_FoundIndicator" /> - <camunda:out source="GENGS_SuccessIndicator" target="GENGS_SuccessIndicator" /> - <camunda:out source="WorkflowException" target="WorkflowException" /> - <camunda:out source="GENGS_siResourceLink" target="GENGS_siResourceLink" /> - <camunda:out source="GENGS_service" target="GENGS_service" /> + <camunda:in source="globalSubscriberId" target="globalSubscriberId" /> + <camunda:in source="serviceType" target="serviceType" /> + <camunda:in source="serviceId" target="serviceId" /> + <camunda:in source="operationId" target="operationId" /> + <camunda:in source="resouceTemplateUUID" target="resouceTemplateUUID" /> + <camunda:in source="resouceInstanceId" target="resouceInstanceId" /> + <camunda:in source="resourceType" target="resourceType" /> + <camunda:in source="operationType" target="operationType" /> </bpmn:extensionElements> <bpmn:incoming>SequenceFlow_1wmjau1</bpmn:incoming> <bpmn:outgoing>SequenceFlow_0qquvgc</bpmn:outgoing> </bpmn:callActivity> - <bpmn:sequenceFlow id="SequenceFlow_1av166w" sourceRef="ExclusiveGateway_0veiutm" targetRef="ScriptTask_0vcz9mj" /> - <bpmn:callActivity id="CallActivity_Del_SDNC_cust" name="Call Custom Delete SDNC" calledElement="CustomSDNCDelete"> - <bpmn:extensionElements> - <camunda:in source="serviceInstanceId" target="GENGS_serviceInstanceId" /> - <camunda:in sourceExpression="service-instance" target="GENGS_type" /> - <camunda:out source="GENGS_FoundIndicator" target="GENGS_FoundIndicator" /> - <camunda:out source="GENGS_SuccessIndicator" target="GENGS_SuccessIndicator" /> - <camunda:out source="WorkflowException" target="WorkflowException" /> - <camunda:out source="GENGS_siResourceLink" target="GENGS_siResourceLink" /> - <camunda:out source="GENGS_service" target="GENGS_service" /> - </bpmn:extensionElements> - <bpmn:incoming>SequenceFlow_1dza4q4</bpmn:incoming> - <bpmn:outgoing>SequenceFlow_0rpu756</bpmn:outgoing> - </bpmn:callActivity> + <bpmn:sequenceFlow id="SequenceFlow_1av166w" sourceRef="ExclusiveGateway_0veiutm" targetRef="Task_0oriv78" /> <bpmn:sequenceFlow id="SequenceFlow_0qquvgc" sourceRef="CallActivity_Del_VFC" targetRef="ScriptTask_0mdub03" /> - <bpmn:sequenceFlow id="SequenceFlow_0ph3iin" sourceRef="ScriptTask_1g0tsto" targetRef="CallActivity_06izbke" /> - <bpmn:scriptTask id="ScriptTask_0vcz9mj" name="PreProcess VFC Delete" scriptFormat="groovy"> - <bpmn:incoming>SequenceFlow_1av166w</bpmn:incoming> + <bpmn:scriptTask id="ScriptTask_0vcz9mj" name="Prepare Resource Delele For vEPC" scriptFormat="groovy"> + <bpmn:incoming>SequenceFlow_1931m8u</bpmn:incoming> <bpmn:outgoing>SequenceFlow_1wmjau1</bpmn:outgoing> <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +String resourceName = "vEPC" def ddsi = new DoCustomDeleteE2EServiceInstance() -ddsi.preProcessVFCDelete(execution)]]></bpmn:script> +ddsi.preResourceDelete(execution, resourceName )]]></bpmn:script> </bpmn:scriptTask> <bpmn:sequenceFlow id="SequenceFlow_1wmjau1" sourceRef="ScriptTask_0vcz9mj" targetRef="CallActivity_Del_VFC" /> <bpmn:scriptTask id="ScriptTask_0mdub03" name="Post Process VFC Delete" scriptFormat="groovy"> <bpmn:incoming>SequenceFlow_0qquvgc</bpmn:incoming> - <bpmn:outgoing>SequenceFlow_01o68xa</bpmn:outgoing> + <bpmn:outgoing>SequenceFlow_0vg4q7x</bpmn:outgoing> <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* String response = execution.getVariable("vfcDeleteResponse") @@ -145,240 +133,388 @@ def ddsi = new DoCustomDeleteE2EServiceInstance() ddsi.postProcessVFCDelete(execution, response, "delete")]]></bpmn:script> </bpmn:scriptTask> <bpmn:scriptTask id="ScriptTask_1g0tsto" name="Post Process SDNC Delete" scriptFormat="groovy"> - <bpmn:incoming>SequenceFlow_0rpu756</bpmn:incoming> - <bpmn:outgoing>SequenceFlow_0ph3iin</bpmn:outgoing> + <bpmn:incoming>SequenceFlow_0uc2beq</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_1m7tont</bpmn:outgoing> <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* String response = execution.getVariable("sdncDeleteResponse") def ddsi = new DoCustomDeleteE2EServiceInstance() ddsi.postProcessSDNCDelete(execution, response, "delete")]]></bpmn:script> </bpmn:scriptTask> - <bpmn:scriptTask id="ScriptTask_0z30dax" name="PreProcess SDNC Delete" scriptFormat="groovy"> - <bpmn:incoming>SequenceFlow_01o68xa</bpmn:incoming> + <bpmn:scriptTask id="ScriptTask_0z30dax" name="Prepare Resource Delele For Overlay" scriptFormat="groovy"> + <bpmn:incoming>SequenceFlow_13sc98g</bpmn:incoming> <bpmn:outgoing>SequenceFlow_1dza4q4</bpmn:outgoing> <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +String resourceName = "overlay" def ddsi = new DoCustomDeleteE2EServiceInstance() -ddsi.preProcessSDNCDelete(execution)]]></bpmn:script> +ddsi.preResourceDelete(execution, resourceName )]]></bpmn:script> </bpmn:scriptTask> - <bpmn:sequenceFlow id="SequenceFlow_01o68xa" sourceRef="ScriptTask_0mdub03" targetRef="ScriptTask_0z30dax" /> <bpmn:sequenceFlow id="SequenceFlow_1dza4q4" sourceRef="ScriptTask_0z30dax" targetRef="CallActivity_Del_SDNC_cust" /> - <bpmn:sequenceFlow id="SequenceFlow_0rpu756" sourceRef="CallActivity_Del_SDNC_cust" targetRef="ScriptTask_1g0tsto" /> + <bpmn:sequenceFlow id="SequenceFlow_0rpu756" sourceRef="CallActivity_Del_SDNC_cust" targetRef="Task_14erap6" /> <bpmn:sequenceFlow id="SequenceFlow_0uhpfcl" name="yes" sourceRef="ExclusiveGateway_0veiutm" targetRef="CallActivity_06izbke"> <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{ execution.getVariable("sdncVersion" ) == "1610" }]]></bpmn:conditionExpression> </bpmn:sequenceFlow> + <bpmn:sequenceFlow id="SequenceFlow_030y6yz" sourceRef="Task_0oriv78" targetRef="Task_0pkgoxn" /> + <bpmn:scriptTask id="Task_0oriv78" name="Prepare Resource Oper Status"> + <bpmn:incoming>SequenceFlow_1av166w</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_030y6yz</bpmn:outgoing> + <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def ddsi = new DoCustomDeleteE2EServiceInstance() +ddsi.preInitResourcesOperStatus(execution)]]></bpmn:script> + </bpmn:scriptTask> + <bpmn:serviceTask id="Task_0pkgoxn" name="Init Resource Oper Status"> + <bpmn:extensionElements> + <camunda:connector> + <camunda:inputOutput> + <camunda:inputParameter name="url">${URN_mso_openecomp_adapters_db_endpoint}</camunda:inputParameter> + <camunda:inputParameter name="headers"> + <camunda:map> + <camunda:entry key="content-type">application/soap+xml</camunda:entry> + <camunda:entry key="Authorization">#{BasicAuthHeaderValueDB}</camunda:entry> + </camunda:map> + </camunda:inputParameter> + <camunda:inputParameter name="payload">${CVFMI_initResOperStatusRequest}</camunda:inputParameter> + <camunda:inputParameter name="method">POST</camunda:inputParameter> + <camunda:outputParameter name="CVFMI_dbResponseCode">${statusCode}</camunda:outputParameter> + <camunda:outputParameter name="CVFMI_dbResponse">${response}</camunda:outputParameter> + </camunda:inputOutput> + <camunda:connectorId>http-connector</camunda:connectorId> + </camunda:connector> + </bpmn:extensionElements> + <bpmn:incoming>SequenceFlow_030y6yz</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_13sc98g</bpmn:outgoing> + </bpmn:serviceTask> + <bpmn:sequenceFlow id="SequenceFlow_1wnkgpx" sourceRef="Task_0z1x3sg" targetRef="Task_0963dho" /> + <bpmn:sequenceFlow id="SequenceFlow_1931m8u" sourceRef="Task_0963dho" targetRef="ScriptTask_0vcz9mj" /> + <bpmn:scriptTask id="Task_0z1x3sg" name="Prepare Resource Delele For vIMS"> + <bpmn:incoming>SequenceFlow_1m7tont</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_1wnkgpx</bpmn:outgoing> + <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +String resourceName = "vIMS" +def ddsi = new DoCustomDeleteE2EServiceInstance() +ddsi.preResourceDelete(execution, resourceName )]]></bpmn:script> + </bpmn:scriptTask> + <bpmn:sequenceFlow id="SequenceFlow_1m7tont" sourceRef="ScriptTask_1g0tsto" targetRef="Task_0z1x3sg" /> + <bpmn:sequenceFlow id="SequenceFlow_13sc98g" sourceRef="Task_0pkgoxn" targetRef="ScriptTask_0z30dax" /> + <bpmn:callActivity id="Task_0963dho" name="Call Network Service Delete for vIMS" calledElement="DODeleteVFCNetworkServiceInstance"> + <bpmn:extensionElements> + <camunda:in source="globalSubscriberId" target="globalSubscriberId" /> + <camunda:in source="serviceType" target="serviceType" /> + <camunda:in source="serviceId" target="serviceId" /> + <camunda:in source="operationId" target="operationId" /> + <camunda:in source="resouceTemplateUUID" target="resouceTemplateUUID" /> + <camunda:in source="resouceInstanceId" target="resouceInstanceId" /> + <camunda:in source="resourceType" target="resourceType" /> + <camunda:in source="operationType" target="operationType" /> + </bpmn:extensionElements> + <bpmn:incoming>SequenceFlow_1wnkgpx</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_1931m8u</bpmn:outgoing> + </bpmn:callActivity> + <bpmn:sequenceFlow id="SequenceFlow_0vg4q7x" sourceRef="ScriptTask_0mdub03" targetRef="CallActivity_06izbke" /> + <bpmn:serviceTask id="CallActivity_Del_SDNC_cust" name="Call Custom Delete SDNC Overlay" camunda:class="org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.SdncNetworkTopologyOperationTask"> + <bpmn:incoming>SequenceFlow_1dza4q4</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_0rpu756</bpmn:outgoing> + </bpmn:serviceTask> + <bpmn:sequenceFlow id="SequenceFlow_0d9lmlv" sourceRef="Task_14erap6" targetRef="Task_1j1u666" /> + <bpmn:sequenceFlow id="SequenceFlow_1g4djgh" sourceRef="Task_1j1u666" targetRef="Task_0edkv0m" /> + <bpmn:sequenceFlow id="SequenceFlow_0uc2beq" sourceRef="Task_0edkv0m" targetRef="ScriptTask_1g0tsto" /> + <bpmn:scriptTask id="Task_14erap6" name="Prepare Resource Delele For Underlay"> + <bpmn:incoming>SequenceFlow_0rpu756</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_0d9lmlv</bpmn:outgoing> + <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +String resourceName = "underlay" +def ddsi = new DoCustomDeleteE2EServiceInstance() +ddsi.preResourceDelete(execution, resourceName )]]></bpmn:script> + </bpmn:scriptTask> + <bpmn:serviceTask id="Task_1j1u666" name="Call Custom Delete SDNC Underlay" camunda:class="org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.SdncNetworkTopologyOperationTask"> + <bpmn:incoming>SequenceFlow_0d9lmlv</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_1g4djgh</bpmn:outgoing> + </bpmn:serviceTask> + <bpmn:serviceTask id="Task_0edkv0m" name="Call Delete SDNC Service Topology" camunda:class="org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.SdncServiceTopologyOperationTask"> + <bpmn:incoming>SequenceFlow_1g4djgh</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_0uc2beq</bpmn:outgoing> + </bpmn:serviceTask> </bpmn:process> <bpmndi:BPMNDiagram id="BPMNDiagram_1"> - <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1"> + <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCustomDeleteE2EServiceInstance"> <bpmndi:BPMNShape id="StartEvent_0212h2r_di" bpmnElement="StartEvent_0212h2r"> - <dc:Bounds x="-224" y="-35" width="36" height="36" /> + <dc:Bounds x="-612" y="-35" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="-230" y="6" width="50" height="12" /> + <dc:Bounds x="-618" y="6" width="50" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_06phzgv_di" bpmnElement="ScriptTask_06phzgv"> - <dc:Bounds x="-155" y="-57" width="100" height="80" /> + <dc:Bounds x="-519" y="-57" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="EndEvent_1uqzt26_di" bpmnElement="EndEvent_1uqzt26"> - <dc:Bounds x="1660" y="107" width="36" height="36" /> + <dc:Bounds x="1220" y="1109" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1588" y="148" width="90" height="12" /> + <dc:Bounds x="1148" y="1150" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="CallActivity_06izbke_di" bpmnElement="CallActivity_06izbke"> - <dc:Bounds x="1470" y="-57" width="100" height="80" /> + <dc:Bounds x="1188" y="779" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ExclusiveGateway_0c6gz3v_di" bpmnElement="ExclusiveGateway_0c6gz3v" isMarkerVisible="true"> - <dc:Bounds x="260" y="-42" width="50" height="50" /> + <dc:Bounds x="-89" y="-42" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="250" y="-63" width="71" height="12" /> + <dc:Bounds x="-99" y="-63" width="71" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="EndEvent_0123yz3_di" bpmnElement="EndEvent_0123yz3"> - <dc:Bounds x="267" y="107" width="36" height="36" /> + <dc:Bounds x="-82" y="107" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="240" y="148" width="0" height="12" /> + <dc:Bounds x="-154" y="148" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ExclusiveGateway_0veiutm_di" bpmnElement="ExclusiveGateway_0veiutm" isMarkerVisible="true"> - <dc:Bounds x="346" y="-42" width="50" height="50" /> + <dc:Bounds x="-8" y="-42" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="339" y="12" width="72" height="24" /> + <dc:Bounds x="-15" y="12" width="72" height="24" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="CallActivity_0x2ulh3_di" bpmnElement="CallActivity_0x2ulh3"> - <dc:Bounds x="-11" y="-57" width="100" height="80" /> + <dc:Bounds x="-382" y="-57" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_1rtnsh8_di" bpmnElement="ScriptTask_1rtnsh8"> - <dc:Bounds x="130" y="-57" width="100" height="80" /> + <dc:Bounds x="-231" y="-57" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_01erufg_di" bpmnElement="ScriptTask_01erufg"> - <dc:Bounds x="1628" y="-57" width="100" height="80" /> + <dc:Bounds x="1188" y="915" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="SubProcess_1u8zt9i_di" bpmnElement="SubProcess_1u8zt9i" isExpanded="true"> - <dc:Bounds x="351" y="210" width="467" height="193" /> + <dc:Bounds x="445" y="320" width="467" height="193" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0vz7cd9_di" bpmnElement="SequenceFlow_0vz7cd9"> - <di:waypoint xsi:type="dc:Point" x="-188" y="-17" /> - <di:waypoint xsi:type="dc:Point" x="-155" y="-17" /> + <di:waypoint xsi:type="dc:Point" x="-576" y="-17" /> + <di:waypoint xsi:type="dc:Point" x="-519" y="-17" /> <bpmndi:BPMNLabel> - <dc:Bounds x="-215.5" y="-32" width="0" height="12" /> + <dc:Bounds x="-592.5" y="-38" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_11e6bfy_di" bpmnElement="SequenceFlow_11e6bfy"> - <di:waypoint xsi:type="dc:Point" x="-55" y="-17" /> - <di:waypoint xsi:type="dc:Point" x="-11" y="-17" /> + <di:waypoint xsi:type="dc:Point" x="-419" y="-17" /> + <di:waypoint xsi:type="dc:Point" x="-382" y="-17" /> <bpmndi:BPMNLabel> - <dc:Bounds x="-78" y="-32" width="0" height="12" /> + <dc:Bounds x="-445.5" y="-38" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0e7inkl_di" bpmnElement="SequenceFlow_0e7inkl"> - <di:waypoint xsi:type="dc:Point" x="1678" y="23" /> - <di:waypoint xsi:type="dc:Point" x="1678" y="61" /> - <di:waypoint xsi:type="dc:Point" x="1678" y="107" /> + <di:waypoint xsi:type="dc:Point" x="1238" y="995" /> + <di:waypoint xsi:type="dc:Point" x="1238" y="1109" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1648" y="36" width="90" height="12" /> + <dc:Bounds x="1208" y="1046" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0g6bxqw_di" bpmnElement="SequenceFlow_0g6bxqw"> - <di:waypoint xsi:type="dc:Point" x="1570" y="-17" /> - <di:waypoint xsi:type="dc:Point" x="1628" y="-17" /> + <di:waypoint xsi:type="dc:Point" x="1238" y="859" /> + <di:waypoint xsi:type="dc:Point" x="1238" y="915" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1554" y="-38" width="90" height="12" /> + <dc:Bounds x="1208" y="881" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0vi0sv6_di" bpmnElement="SequenceFlow_0vi0sv6"> - <di:waypoint xsi:type="dc:Point" x="230" y="-17" /> - <di:waypoint xsi:type="dc:Point" x="260" y="-17" /> + <di:waypoint xsi:type="dc:Point" x="-131" y="-17" /> + <di:waypoint xsi:type="dc:Point" x="-89" y="-17" /> <bpmndi:BPMNLabel> - <dc:Bounds x="200" y="-32" width="0" height="12" /> + <dc:Bounds x="-155" y="-38" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1pcmc9e_di" bpmnElement="SequenceFlow_1pcmc9e"> - <di:waypoint xsi:type="dc:Point" x="310" y="-17" /> - <di:waypoint xsi:type="dc:Point" x="346" y="-17" /> + <di:waypoint xsi:type="dc:Point" x="-39" y="-17" /> + <di:waypoint xsi:type="dc:Point" x="-8" y="-17" /> <bpmndi:BPMNLabel> - <dc:Bounds x="332" y="-15" width="19" height="12" /> + <dc:Bounds x="-21.375" y="-15" width="19" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0g20hqr_di" bpmnElement="SequenceFlow_0g20hqr"> - <di:waypoint xsi:type="dc:Point" x="285" y="8" /> - <di:waypoint xsi:type="dc:Point" x="285" y="107" /> + <di:waypoint xsi:type="dc:Point" x="-64" y="8" /> + <di:waypoint xsi:type="dc:Point" x="-64" y="107" /> <bpmndi:BPMNLabel> - <dc:Bounds x="266" y="24" width="12" height="12" /> + <dc:Bounds x="-83" y="28" width="12" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0sj8yc8_di" bpmnElement="SequenceFlow_0sj8yc8"> - <di:waypoint xsi:type="dc:Point" x="89" y="-17" /> - <di:waypoint xsi:type="dc:Point" x="130" y="-17" /> + <di:waypoint xsi:type="dc:Point" x="-282" y="-17" /> + <di:waypoint xsi:type="dc:Point" x="-231" y="-17" /> <bpmndi:BPMNLabel> - <dc:Bounds x="65.5" y="-32" width="0" height="12" /> + <dc:Bounds x="-301.5" y="-38" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="StartEvent_0sf5lpt_di" bpmnElement="StartEvent_0sf5lpt"> - <dc:Bounds x="419" y="277" width="36" height="36" /> + <dc:Bounds x="513" y="387" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="347" y="318" width="90" height="12" /> + <dc:Bounds x="441" y="428" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="EndEvent_06utmg4_di" bpmnElement="EndEvent_06utmg4"> - <dc:Bounds x="712" y="277" width="36" height="36" /> + <dc:Bounds x="806" y="387" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="640" y="318" width="90" height="12" /> + <dc:Bounds x="734" y="428" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_0nha3pr_di" bpmnElement="ScriptTask_0nha3pr"> - <dc:Bounds x="523" y="255" width="100" height="80" /> + <dc:Bounds x="617" y="365" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1921mo3_di" bpmnElement="SequenceFlow_1921mo3"> - <di:waypoint xsi:type="dc:Point" x="455" y="295" /> - <di:waypoint xsi:type="dc:Point" x="523" y="295" /> + <di:waypoint xsi:type="dc:Point" x="549" y="405" /> + <di:waypoint xsi:type="dc:Point" x="617" y="405" /> <bpmndi:BPMNLabel> - <dc:Bounds x="399" y="280" width="90" height="12" /> + <dc:Bounds x="493" y="390" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_18vlzfo_di" bpmnElement="SequenceFlow_18vlzfo"> - <di:waypoint xsi:type="dc:Point" x="623" y="295" /> - <di:waypoint xsi:type="dc:Point" x="712" y="295" /> + <di:waypoint xsi:type="dc:Point" x="717" y="405" /> + <di:waypoint xsi:type="dc:Point" x="806" y="405" /> <bpmndi:BPMNLabel> - <dc:Bounds x="579" y="280" width="90" height="12" /> + <dc:Bounds x="673" y="390" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="CallActivity_1x56smn_di" bpmnElement="CallActivity_Del_VFC"> - <dc:Bounds x="619" y="-57" width="100" height="80" /> + <dc:Bounds x="1188" y="483" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1av166w_di" bpmnElement="SequenceFlow_1av166w"> - <di:waypoint xsi:type="dc:Point" x="396" y="-17" /> - <di:waypoint xsi:type="dc:Point" x="459" y="-17" /> + <di:waypoint xsi:type="dc:Point" x="42" y="-17" /> + <di:waypoint xsi:type="dc:Point" x="87" y="-17" /> <bpmndi:BPMNLabel> - <dc:Bounds x="382.5" y="-38" width="90" height="12" /> + <dc:Bounds x="19.5" y="-38" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="CallActivity_1lb0hcm_di" bpmnElement="CallActivity_Del_SDNC_cust"> - <dc:Bounds x="1138" y="-57" width="100" height="80" /> - </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0qquvgc_di" bpmnElement="SequenceFlow_0qquvgc"> - <di:waypoint xsi:type="dc:Point" x="719" y="-17" /> - <di:waypoint xsi:type="dc:Point" x="787" y="-17" /> + <di:waypoint xsi:type="dc:Point" x="1238" y="563" /> + <di:waypoint xsi:type="dc:Point" x="1238" y="642" /> <bpmndi:BPMNLabel> - <dc:Bounds x="708" y="-38" width="90" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="SequenceFlow_0ph3iin_di" bpmnElement="SequenceFlow_0ph3iin"> - <di:waypoint xsi:type="dc:Point" x="1400" y="-17" /> - <di:waypoint xsi:type="dc:Point" x="1470" y="-17" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="1390" y="-38" width="90" height="12" /> + <dc:Bounds x="1208" y="596.5" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_0vcz9mj_di" bpmnElement="ScriptTask_0vcz9mj"> - <dc:Bounds x="459" y="-57" width="100" height="80" /> + <dc:Bounds x="1188" y="338" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1wmjau1_di" bpmnElement="SequenceFlow_1wmjau1"> - <di:waypoint xsi:type="dc:Point" x="559" y="-17" /> - <di:waypoint xsi:type="dc:Point" x="619" y="-17" /> + <di:waypoint xsi:type="dc:Point" x="1238" y="418" /> + <di:waypoint xsi:type="dc:Point" x="1238" y="483" /> <bpmndi:BPMNLabel> - <dc:Bounds x="589" y="-38" width="0" height="12" /> + <dc:Bounds x="1208" y="444.5" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_0mdub03_di" bpmnElement="ScriptTask_0mdub03"> - <dc:Bounds x="787" y="-57" width="100" height="80" /> + <dc:Bounds x="1188" y="642" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_1g0tsto_di" bpmnElement="ScriptTask_1g0tsto"> - <dc:Bounds x="1300" y="-57" width="100" height="80" /> + <dc:Bounds x="1188" y="-57" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_0z30dax_di" bpmnElement="ScriptTask_0z30dax"> - <dc:Bounds x="962" y="-57" width="100" height="80" /> + <dc:Bounds x="377" y="-57" width="100" height="80" /> </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_01o68xa_di" bpmnElement="SequenceFlow_01o68xa"> - <di:waypoint xsi:type="dc:Point" x="887" y="-17" /> - <di:waypoint xsi:type="dc:Point" x="962" y="-17" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="924.5" y="-38" width="0" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1dza4q4_di" bpmnElement="SequenceFlow_1dza4q4"> - <di:waypoint xsi:type="dc:Point" x="1062" y="-17" /> - <di:waypoint xsi:type="dc:Point" x="1138" y="-17" /> + <di:waypoint xsi:type="dc:Point" x="477" y="-17" /> + <di:waypoint xsi:type="dc:Point" x="523" y="-17" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1100" y="-38" width="0" height="12" /> + <dc:Bounds x="455" y="-38" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0rpu756_di" bpmnElement="SequenceFlow_0rpu756"> - <di:waypoint xsi:type="dc:Point" x="1238" y="-17" /> - <di:waypoint xsi:type="dc:Point" x="1300" y="-17" /> + <di:waypoint xsi:type="dc:Point" x="623" y="-17" /> + <di:waypoint xsi:type="dc:Point" x="711" y="-17" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1269" y="-38" width="0" height="12" /> + <dc:Bounds x="622" y="-38" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0uhpfcl_di" bpmnElement="SequenceFlow_0uhpfcl"> - <di:waypoint xsi:type="dc:Point" x="371" y="-42" /> - <di:waypoint xsi:type="dc:Point" x="371" y="-134" /> - <di:waypoint xsi:type="dc:Point" x="1520" y="-134" /> - <di:waypoint xsi:type="dc:Point" x="1520" y="-57" /> + <di:waypoint xsi:type="dc:Point" x="17" y="8" /> + <di:waypoint xsi:type="dc:Point" x="17" y="819" /> + <di:waypoint xsi:type="dc:Point" x="1188" y="819" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="540.0043516100959" y="793" width="19" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_030y6yz_di" bpmnElement="SequenceFlow_030y6yz"> + <di:waypoint xsi:type="dc:Point" x="187" y="-17" /> + <di:waypoint xsi:type="dc:Point" x="212" y="-17" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="199.5" y="-38" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ScriptTask_19o0tpz_di" bpmnElement="Task_0oriv78"> + <dc:Bounds x="87" y="-57" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ServiceTask_07erhm6_di" bpmnElement="Task_0pkgoxn"> + <dc:Bounds x="212" y="-57" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1wnkgpx_di" bpmnElement="SequenceFlow_1wnkgpx"> + <di:waypoint xsi:type="dc:Point" x="1237" y="134" /> + <di:waypoint xsi:type="dc:Point" x="1238" y="192" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1237.5" y="142" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1931m8u_di" bpmnElement="SequenceFlow_1931m8u"> + <di:waypoint xsi:type="dc:Point" x="1237" y="272" /> + <di:waypoint xsi:type="dc:Point" x="1238" y="338" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1237.5" y="284" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ScriptTask_00301ai_di" bpmnElement="Task_0z1x3sg"> + <dc:Bounds x="1188" y="54" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1m7tont_di" bpmnElement="SequenceFlow_1m7tont"> + <di:waypoint xsi:type="dc:Point" x="1238" y="23" /> + <di:waypoint xsi:type="dc:Point" x="1238" y="54" /> <bpmndi:BPMNLabel> - <dc:Bounds x="884.6283985846136" y="-160" width="18" height="12" /> + <dc:Bounds x="1253" y="32.5" width="0" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_13sc98g_di" bpmnElement="SequenceFlow_13sc98g"> + <di:waypoint xsi:type="dc:Point" x="312" y="-17" /> + <di:waypoint xsi:type="dc:Point" x="377" y="-17" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="344.5" y="-38" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="CallActivity_1mwacgl_di" bpmnElement="Task_0963dho"> + <dc:Bounds x="1188" y="192" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_0vg4q7x_di" bpmnElement="SequenceFlow_0vg4q7x"> + <di:waypoint xsi:type="dc:Point" x="1238" y="722" /> + <di:waypoint xsi:type="dc:Point" x="1238" y="779" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1253" y="744.5" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ServiceTask_0v9q75y_di" bpmnElement="CallActivity_Del_SDNC_cust"> + <dc:Bounds x="523" y="-57" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_0d9lmlv_di" bpmnElement="SequenceFlow_0d9lmlv"> + <di:waypoint xsi:type="dc:Point" x="811" y="-17" /> + <di:waypoint xsi:type="dc:Point" x="898" y="-17" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="854.5" y="-38" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1g4djgh_di" bpmnElement="SequenceFlow_1g4djgh"> + <di:waypoint xsi:type="dc:Point" x="998" y="-17" /> + <di:waypoint xsi:type="dc:Point" x="1052" y="-17" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1025" y="-38" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_0uc2beq_di" bpmnElement="SequenceFlow_0uc2beq"> + <di:waypoint xsi:type="dc:Point" x="1152" y="-17" /> + <di:waypoint xsi:type="dc:Point" x="1188" y="-17" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1170" y="-38" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ScriptTask_1e5z0wu_di" bpmnElement="Task_14erap6"> + <dc:Bounds x="711" y="-57" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ServiceTask_0f0965f_di" bpmnElement="Task_1j1u666"> + <dc:Bounds x="898" y="-57" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ServiceTask_0p4b7e1_di" bpmnElement="Task_0edkv0m"> + <dc:Bounds x="1052" y="-57" width="100" height="80" /> + </bpmndi:BPMNShape> </bpmndi:BPMNPlane> </bpmndi:BPMNDiagram> </bpmn:definitions> diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/MsoRequest.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/MsoRequest.java index 9b975facc6..27c3c2b283 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/MsoRequest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/MsoRequest.java @@ -254,7 +254,7 @@ public class MsoRequest { RequestParameters requestParameters = sir.getRequestDetails().getRequestParameters(); if(this.reqVersion >= 3){ if(requestParameters!=null){ - this.aLaCarteFlag = sir.getRequestDetails().getRequestParameters().getALaCarte(); + this.aLaCarteFlag = sir.getRequestDetails().getRequestParameters().isaLaCarte(); }else{ this.aLaCarteFlag = false; } @@ -1010,4 +1010,4 @@ public class MsoRequest { public void setReqVersion(int reqVersion) { this.reqVersion = reqVersion; } -}
\ No newline at end of file +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/ServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/ServiceInstances.java index 66a14db610..6413c4bf57 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/ServiceInstances.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/ServiceInstances.java @@ -771,7 +771,7 @@ public class ServiceInstances { } //if an aLaCarte flag was sent in the request, throw an error if the recipe was not found RequestParameters reqParam = msoRequest.getServiceInstancesRequest().getRequestDetails().getRequestParameters(); - if(reqParam!=null && reqParam.isALaCarteSet() && recipe==null){ + if(reqParam!=null && reqParam.isaLaCarteSet() && recipe==null){ return null; }else if (recipe == null) { //aLaCarte wasn't sent, so we'll try the default serviceRecord = db.getServiceByModelName(defaultServiceModelName); diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestParameters.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestParameters.java index a2acc3c3e4..f34272954d 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestParameters.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestParameters.java @@ -36,7 +36,7 @@ public class RequestParameters { @JsonSerialize(include=Inclusion.ALWAYS) private boolean aLaCarte = false; @JsonIgnore - private boolean isALaCarteSet = false; + private boolean aLaCarteSet = false; @JsonSerialize(include=Inclusion.ALWAYS) private boolean autoBuildVfModules = false; @JsonSerialize(include=Inclusion.ALWAYS) @@ -55,18 +55,14 @@ public class RequestParameters { this.subscriptionServiceType = subscriptionServiceType; } - public boolean getALaCarte() { - return aLaCarte; - } - public void setaLaCarte(boolean aLaCarte) { this.aLaCarte = aLaCarte; - this.isALaCarteSet = true; + this.aLaCarteSet = true; } //returns true if aLaCarte param came in on request - public boolean isALaCarteSet() { - return isALaCarteSet; + public boolean isaLaCarteSet() { + return aLaCarteSet; } public boolean isaLaCarte() { diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/MsoRequestTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/MsoRequestTest.java index d20357d4be..6a7fc2c723 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/MsoRequestTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/MsoRequestTest.java @@ -84,7 +84,7 @@ public class MsoRequestTest { assertEquals(msoRequest.getRequestInfo().getSource(),"VID"); assertFalse(msoRequest.getALaCarteFlag()); assertEquals(msoRequest.getReqVersion(),3); - boolean testIsALaCarteSet = msoRequest.getServiceInstancesRequest().getRequestDetails().getRequestParameters().isALaCarteSet(); + boolean testIsALaCarteSet = msoRequest.getServiceInstancesRequest().getRequestDetails().getRequestParameters().isaLaCarteSet(); assertFalse(testIsALaCarteSet); } @@ -186,13 +186,13 @@ public class MsoRequestTest { ServiceInstancesRequest sir = mapper.readValue(requestJSON1, ServiceInstancesRequest.class); MsoRequest msoRequest = new MsoRequest ("1234"); msoRequest.parse(sir, instanceIdMap, Action.deleteInstance, "v3"); - boolean testIsALaCarteSet = msoRequest.getServiceInstancesRequest().getRequestDetails().getRequestParameters().isALaCarteSet(); + boolean testIsALaCarteSet = msoRequest.getServiceInstancesRequest().getRequestDetails().getRequestParameters().isaLaCarteSet(); assertTrue(testIsALaCarteSet); assertFalse(msoRequest.getALaCarteFlag()); sir = mapper.readValue(requestJSON2, ServiceInstancesRequest.class); msoRequest = new MsoRequest ("12345"); msoRequest.parse(sir, instanceIdMap, Action.deleteInstance, "v3"); - testIsALaCarteSet = msoRequest.getServiceInstancesRequest().getRequestDetails().getRequestParameters().isALaCarteSet(); + testIsALaCarteSet = msoRequest.getServiceInstancesRequest().getRequestDetails().getRequestParameters().isaLaCarteSet(); assertTrue(testIsALaCarteSet); assertTrue(msoRequest.getALaCarteFlag()); diff --git a/packages/deliveries/src/main/assembly/war-pack/mso-wars.xml b/packages/deliveries/src/main/assembly/war-pack/mso-wars.xml index 1a2c07df57..efbd78740b 100644 --- a/packages/deliveries/src/main/assembly/war-pack/mso-wars.xml +++ b/packages/deliveries/src/main/assembly/war-pack/mso-wars.xml @@ -62,7 +62,14 @@ <directory>../../adapters/mso-vnf-adapter/target/</directory> <outputDirectory>artifacts</outputDirectory> </fileSet> - + <!--add vfc adapter--> + <fileSet> + <includes> + <include>mso-vfc-adapter*.war</include> + </includes> + <directory>../../adapters/mso-vfc-adapter/target/</directory> + <outputDirectory>artifacts</outputDirectory> + </fileSet> <fileSet> <includes> <include>mso-api-handler*.war</include> |