commit 8267bf34e1f58c168a53c2b301f57f2f4898e599
author Seshu Kumar M <seshu.kumar.m@huawei.com> Fri Jul 27 10:34:44 2018 +0000
committer Gerrit Code Review <gerrit@onap.org> Fri Jul 27 10:34:44 2018 +0000
tree 89f6eee73081b95799e579c05c138784f5f1fa6b
parent ba35239d54f39ad303b31a924d0f6a7d742a4e56
parent 530b7bf883d76f3afc21ed64b5f213ec1a29fd96

Merge "Fix gateway condition in sdncresource"

bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateSDNCNetworkResource.bpmn

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateSDNCNetworkResource.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateSDNCNetworkResource.bpmn
index ceb1371..8724804 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateSDNCNetworkResource.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateSDNCNetworkResource.bpmn
@@ -118,7 +118,9 @@
       <bpmn:outgoing>SequenceFlow_1dww8ye</bpmn:outgoing>
       <bpmn:outgoing>SequenceFlow_05m2j56</bpmn:outgoing>
     </bpmn:exclusiveGateway>
-    <bpmn:sequenceFlow id="SequenceFlow_1dww8ye" name="yes" sourceRef="ExclusiveGateway_0cdulnk" targetRef="Task_0bga3e8" />
+    <bpmn:sequenceFlow id="SequenceFlow_1dww8ye" name="yes" sourceRef="ExclusiveGateway_0cdulnk" targetRef="Task_0bga3e8">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{(execution.getVariable("isActivateRequired") == "true")}</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="SequenceFlow_1ex9ov6" sourceRef="CallActivity_1600xlj" targetRef="Task_023hred" />
     <bpmn:sequenceFlow id="SequenceFlow_1kzj1j5" sourceRef="Task_023hred" targetRef="ServiceTask_1cm8iwr" />
     <bpmn:sequenceFlow id="SequenceFlow_0o7h0ag" sourceRef="ServiceTask_1cm8iwr" targetRef="ExclusiveGateway_0cdulnk" />