Commit 10958d50 authored by Christos Tranoris's avatar Christos Tranoris
Browse files

Merge branch 'develop' into parent-child-characteristics

parents ade395f3 094dd220

src/main/java/org/etsi/osl/osom/management/CROrchestrationService.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -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.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")) {

src/main/resources/processes/ServiceCreationProcess.bpmn

+3 −1
Original line number Original line Diff line number Diff line
@@ -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">