Skip to content
Snippets Groups Projects
Commit 524ac4de authored by tranoris's avatar tranoris
Browse files

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

parent 60c6bf81
No related branches found
No related tags found
1 merge request!12Merging 2024Q2_RC into main, creating 2024Q2 Release
......@@ -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")) {
......
......@@ -29,7 +29,7 @@
<exclusiveGateway id="exclusivegateway2" name="Exclusive Gateway"></exclusiveGateway>
<sequenceFlow id="flow26" sourceRef="stAutomationCheck" targetRef="exclusivegateway2"></sequenceFlow>
<sequenceFlow id="flow27" name="brokeActivity==&quot;RFS_OSM&quot;" sourceRef="exclusivegateway2" targetRef="parallelActivityNFVODeploymentReq">
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${brokeActivity=='RFS'}]]></conditionExpression>
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${brokeActivity=='RFS_OSM'}]]></conditionExpression>
</sequenceFlow>
<sequenceFlow id="flow28" name="brokeActivity==&quot;PARTNER&quot;" sourceRef="exclusivegateway2" targetRef="parallelExternalSPDeploymentReqProcess">
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${brokeActivity=='PARTNER'}]]></conditionExpression>
......@@ -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==&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>
</process>
<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