From 094dd2206ebff8f48b59cb92b388db518a3967ac Mon Sep 17 00:00:00 2001
From: Christos Tranoris <tranoris@ece.upatras.gr>
Date: Mon, 5 Feb 2024 17:11:13 +0200
Subject: [PATCH] Fix for #16 by adding the correct condition to bpmn xml
---
.../org/etsi/osl/osom/management/CROrchestrationService.java | 3 +++
src/main/resources/processes/ServiceCreationProcess.bpmn | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
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 08fc212..235012d 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 8283480..9a5df08 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">
--
GitLab