Skip to content
Snippets Groups Projects
Commit 2a7e7634 authored by tranoris's avatar tranoris Committed by trantzas
Browse files

Fix for #16 by adding the correct condition to bpmn xml

(cherry picked from commit 094dd220)
parent 15dda1ef
No related branches found
No related tags found
No related merge requests found
...@@ -211,6 +211,9 @@ public class CROrchestrationService implements JavaDelegate { ...@@ -211,6 +211,9 @@ public class CROrchestrationService implements JavaDelegate {
map.put("org.etsi.osl.statusCheckValueUnknown", getServiceCharacteristic(aService, "_CR_CHECKVAL_UNKNOWN") ); map.put("org.etsi.osl.statusCheckValueUnknown", getServiceCharacteristic(aService, "_CR_CHECKVAL_UNKNOWN") );
map.put("org.etsi.osl.statusCheckValueSuspended", getServiceCharacteristic(aService, "_CR_CHECKVAL_SUSPENDED") ); 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); String response = serviceOrderManager.cridgeDeploymentRequest( map, _CR_SPEC);
int retries = 0; int retries = 0;
while ( response.equals("SEE OTHER")) { while ( response.equals("SEE OTHER")) {
......
...@@ -76,7 +76,9 @@ ...@@ -76,7 +76,9 @@
</sequenceFlow> </sequenceFlow>
<sequenceFlow id="flow42" sourceRef="parallelActivityServiceTestOrchestrationProcess" targetRef="servicetaskCheckForCreatedServices"></sequenceFlow> <sequenceFlow id="flow42" sourceRef="parallelActivityServiceTestOrchestrationProcess" targetRef="servicetaskCheckForCreatedServices"></sequenceFlow>
<callActivity id="parallelActivityCRDeploymentReq" name="CR Deployment Request" calledElement="procCRDeploymentRequest" activiti:inheritVariables="true"></callActivity> <callActivity id="parallelActivityCRDeploymentReq" name="CR Deployment Request" calledElement="procCRDeploymentRequest" activiti:inheritVariables="true"></callActivity>
<sequenceFlow id="flow43" name="brokeActivity==&quot;RFS_CRSPEC&quot;" sourceRef="exclusivegateway2" targetRef="parallelActivityCRDeploymentReq"></sequenceFlow> <sequenceFlow id="flow43" name="brokeActivity==&quot;RFS_CRSPEC&quot;" sourceRef="exclusivegateway2" targetRef="parallelActivityCRDeploymentReq">
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${brokeActivity=='RFS_CRSPEC'}]]></conditionExpression>
</sequenceFlow>
<sequenceFlow id="flow44" sourceRef="parallelActivityCRDeploymentReq" targetRef="servicetaskCheckForCreatedServices"></sequenceFlow> <sequenceFlow id="flow44" sourceRef="parallelActivityCRDeploymentReq" targetRef="servicetaskCheckForCreatedServices"></sequenceFlow>
</process> </process>
<bpmndi:BPMNDiagram id="BPMNDiagram_CreateServiceProcess"> <bpmndi:BPMNDiagram id="BPMNDiagram_CreateServiceProcess">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment