Commit d7cd8ff4 authored by Christos Tranoris's avatar Christos Tranoris
Browse files

Merge branch 'develop' into parent-child-characteristics

parents 10958d50 b7976728

src/main/resources/processes/ServiceCreationProcess.bpmn

+1 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ 
    <exclusiveGateway id="exclusivegateway2" name="Exclusive Gateway"></exclusiveGateway>

    <exclusiveGateway id="exclusivegateway2" name="Exclusive Gateway"></exclusiveGateway>

    <sequenceFlow id="flow26" sourceRef="stAutomationCheck" targetRef="exclusivegateway2"></sequenceFlow>

    <sequenceFlow id="flow26" sourceRef="stAutomationCheck" targetRef="exclusivegateway2"></sequenceFlow>

    <sequenceFlow id="flow27" name="brokeActivity==&quot;RFS_OSM&quot;" sourceRef="exclusivegateway2" targetRef="parallelActivityNFVODeploymentReq">

    <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>

    <sequenceFlow id="flow28" name="brokeActivity==&quot;PARTNER&quot;" sourceRef="exclusivegateway2" targetRef="parallelExternalSPDeploymentReqProcess">

    <sequenceFlow id="flow28" name="brokeActivity==&quot;PARTNER&quot;" sourceRef="exclusivegateway2" targetRef="parallelExternalSPDeploymentReqProcess">

      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${brokeActivity=='PARTNER'}]]></conditionExpression>

      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${brokeActivity=='PARTNER'}]]></conditionExpression>