diff --git a/src/main/java/org/etsi/osl/osom/management/CROrchestrationService.java b/src/main/java/org/etsi/osl/osom/management/CROrchestrationService.java index 08fc212cad95092f06ee8fb02233486195115174..235012d76826f393907031bf5c2cf94a126f7f52 100644 --- a/src/main/java/org/etsi/osl/osom/management/CROrchestrationService.java +++ b/src/main/java/org/etsi/osl/osom/management/CROrchestrationService.java @@ -253,6 +253,9 @@ public class CROrchestrationService implements JavaDelegate { map.put("org.etsi.osl.statusCheckValueUnknown", getServiceCharacteristic(aService, "_CR_CHECKVAL_UNKNOWN") ); map.put("org.etsi.osl.statusCheckValueSuspended", getServiceCharacteristic(aService, "_CR_CHECKVAL_SUSPENDED") ); + + logger.debug("createNewDeploymentRequest _CR_SPEC = " + _CR_SPEC); + String response = serviceOrderManager.cridgeDeploymentRequest( map, _CR_SPEC); int retries = 0; while ( response.equals("SEE OTHER")) { diff --git a/src/main/resources/processes/ServiceCreationProcess.bpmn b/src/main/resources/processes/ServiceCreationProcess.bpmn index 8283480a849adba0cabc71fccdc891ff010987a5..9a5df08655c5c0122f99e25ec17d027b8d624e07 100644 --- a/src/main/resources/processes/ServiceCreationProcess.bpmn +++ b/src/main/resources/processes/ServiceCreationProcess.bpmn @@ -76,7 +76,9 @@ </sequenceFlow> <sequenceFlow id="flow42" sourceRef="parallelActivityServiceTestOrchestrationProcess" targetRef="servicetaskCheckForCreatedServices"></sequenceFlow> <callActivity id="parallelActivityCRDeploymentReq" name="CR Deployment Request" calledElement="procCRDeploymentRequest" activiti:inheritVariables="true"></callActivity> - <sequenceFlow id="flow43" name="brokeActivity=="RFS_CRSPEC"" sourceRef="exclusivegateway2" targetRef="parallelActivityCRDeploymentReq"></sequenceFlow> + <sequenceFlow id="flow43" name="brokeActivity=="RFS_CRSPEC"" sourceRef="exclusivegateway2" targetRef="parallelActivityCRDeploymentReq"> + <conditionExpression xsi:type="tFormalExpression"><![CDATA[${brokeActivity=='RFS_CRSPEC'}]]></conditionExpression> + </sequenceFlow> <sequenceFlow id="flow44" sourceRef="parallelActivityCRDeploymentReq" targetRef="servicetaskCheckForCreatedServices"></sequenceFlow> </process> <bpmndi:BPMNDiagram id="BPMNDiagram_CreateServiceProcess">