From 63beec3259fa1e3f8abb04ffe3c7d7145d25d968 Mon Sep 17 00:00:00 2001
From: Seshu-Kumar-M <seshu.kumar.m@huawei.com>
Date: Thu, 21 Sep 2017 13:34:41 +0530
Subject: [PATCH] Adding Underlay VPN

Adding network id before Underlay VPN in E2E svc creation

IssueId: SO-152

Change-Id: If6311914633c7247b62362ca9371c54c426889bc
Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>
---
 .../subprocess/DoCreateE2EServiceInstance.bpmn     | 119 +++++++++------------
 1 file changed, 48 insertions(+), 71 deletions(-)

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn
index d5ddac1803..2b3cfa6a8b 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn
@@ -22,7 +22,6 @@ dcsi.preProcessRequest(execution)
 ]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="CustomE2EGetService" targetRef="ScriptTask_0i8cqdy" />
-    <bpmn2:endEvent id="EndEvent_3" />
     <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="preProcessRequest_ScriptTask" targetRef="getAAICustomerById_scriptTask" />
     <bpmn2:callActivity id="CustomE2EGetService" name="Call Custom E2E Get Service" calledElement="CustomE2EGetService">
       <bpmn2:extensionElements>
@@ -128,19 +127,15 @@ def ddsi = new DoCreateE2EServiceInstance()
 ddsi.postProcessAAIPUT(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_1dd86x8" sourceRef="ScriptTask_0q37vn9" targetRef="ExclusiveGateway_1nk6aol" />
-    <bpmn2:scriptTask id="ScriptTask_1tp0fcx" name="Post Process AAI GET2" scriptFormat="groovy">    <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def dcsi = new DoCreateE2EServiceInstance()
-dcsi.postProcessAAIGET2(execution)]]></bpmn2:script>
-</bpmn2:scriptTask>
     <bpmn2:scriptTask id="ScriptTask_0081lne" name="Prepare SDN-C Adaptor Data Request" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_1170ztf</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_0mcyg0e</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0ofqw6v</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def csi = new  DoCreateE2EServiceInstance()
 csi.preSDNCRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="ScriptTask_0wvq4t8" name="Prepare VF-C Adaptor Data Request" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_1d4wn2y</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_1170ztf</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_15zgrcq</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def csi = new  DoCreateE2EServiceInstance()
@@ -154,18 +149,18 @@ csi.preVFCRequest(execution)]]></bpmn2:script>
       <bpmn2:incoming>SequenceFlow_15zgrcq</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1x8vphc</bpmn2:outgoing>
     </bpmn2:callActivity>
-    <bpmn2:exclusiveGateway id="ExclusiveGateway_0lczgac" name="Sueecss?">
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_0lczgac" name="Sueecss?" default="SequenceFlow_1yv1kef">
       <bpmn2:incoming>SequenceFlow_1vvdkcs</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1yv1kef</bpmn2:outgoing>
       <bpmn2:outgoing>SequenceFlow_1d4wn2y</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
-    <bpmn2:exclusiveGateway id="ExclusiveGateway_0cdz77v" name="Success?">
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_0cdz77v" name="Success?" default="SequenceFlow_0ou0spo">
       <bpmn2:incoming>SequenceFlow_1x8vphc</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0ou0spo</bpmn2:outgoing>
       <bpmn2:outgoing>SequenceFlow_0mcyg0e</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
     <bpmn2:scriptTask id="ScriptTask_1xdjlzm" name="Post Config Service Instance Creation" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_0mcyg0e</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_1d4wn2y</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_092ghvu</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def csi = new  DoCreateE2EServiceInstance()
@@ -175,18 +170,14 @@ csi.postConfigRequest(execution)]]></bpmn2:script>
     <bpmn2:sequenceFlow id="SequenceFlow_15zgrcq" sourceRef="ScriptTask_0wvq4t8" targetRef="CallActivity_0uwm4l1" />
     <bpmn2:sequenceFlow id="SequenceFlow_1vvdkcs" sourceRef="CallActivity_09c3ajg" targetRef="ExclusiveGateway_0lczgac" />
     <bpmn2:sequenceFlow id="SequenceFlow_1x8vphc" sourceRef="CallActivity_0uwm4l1" targetRef="ExclusiveGateway_0cdz77v" />
-    <bpmn2:sequenceFlow id="SequenceFlow_1yv1kef" name="No" sourceRef="ExclusiveGateway_0lczgac" targetRef="EndEvent_11lmyvs">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("WorkflowException") != null}]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="SequenceFlow_1d4wn2y" name="Yes" sourceRef="ExclusiveGateway_0lczgac" targetRef="ScriptTask_0wvq4t8">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("WorkflowException") != null}]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="SequenceFlow_0ou0spo" name="No" sourceRef="ExclusiveGateway_0cdz77v" targetRef="EndEvent_01h4q8z">
+    <bpmn2:sequenceFlow id="SequenceFlow_1yv1kef" name="No" sourceRef="ExclusiveGateway_0lczgac" targetRef="EndEvent_11lmyvs" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1d4wn2y" name="Yes" sourceRef="ExclusiveGateway_0lczgac" targetRef="ScriptTask_1xdjlzm">
       <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("WorkflowException") != null}]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="SequenceFlow_0ou0spo" name="No" sourceRef="ExclusiveGateway_0cdz77v" targetRef="EndEvent_01h4q8z" />
     <bpmn2:sequenceFlow id="SequenceFlow_092ghvu" sourceRef="ScriptTask_1xdjlzm" targetRef="EndEvent_0kbbt94" />
-    <bpmn2:sequenceFlow id="SequenceFlow_0mcyg0e" sourceRef="ExclusiveGateway_0cdz77v" targetRef="ScriptTask_1xdjlzm" />
-    <bpmn2:sequenceFlow id="SequenceFlow_1170ztf" sourceRef="ExclusiveGateway_1nk6aol" targetRef="ScriptTask_0081lne" />
+    <bpmn2:sequenceFlow id="SequenceFlow_0mcyg0e" sourceRef="ExclusiveGateway_0cdz77v" targetRef="ScriptTask_0081lne" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1170ztf" sourceRef="ExclusiveGateway_1nk6aol" targetRef="ScriptTask_0wvq4t8" />
     <bpmn2:endEvent id="EndEvent_11lmyvs">
       <bpmn2:incoming>SequenceFlow_1yv1kef</bpmn2:incoming>
     </bpmn2:endEvent>
@@ -227,12 +218,6 @@ csi.postConfigRequest(execution)]]></bpmn2:script>
           <dc:Bounds x="529" y="82" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="EndEvent_3">
-        <dc:Bounds x="1670" y="1159" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1643" y="1200" width="90" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_4">
         <di:waypoint xsi:type="dc:Point" x="839" y="94" />
         <di:waypoint xsi:type="dc:Point" x="971" y="94" />
@@ -376,86 +361,80 @@ csi.postConfigRequest(execution)]]></bpmn2:script>
           <dc:Bounds x="335" y="507" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ScriptTask_1tp0fcx_di" bpmnElement="ScriptTask_1tp0fcx">
-        <dc:Bounds x="1527" y="1137" width="100" height="80" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0081lne_di" bpmnElement="ScriptTask_0081lne">
-        <dc:Bounds x="972" y="552" width="100" height="80" />
+        <dc:Bounds x="786" y="818" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0wvq4t8_di" bpmnElement="ScriptTask_0wvq4t8">
-        <dc:Bounds x="713" y="818" width="100" height="80" />
+        <dc:Bounds x="972" y="564" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_09c3ajg_di" bpmnElement="CallActivity_09c3ajg">
-        <dc:Bounds x="972" y="694" width="100" height="80" />
+        <dc:Bounds x="573" y="819" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_0uwm4l1_di" bpmnElement="CallActivity_0uwm4l1">
-        <dc:Bounds x="517" y="818" width="100" height="80" />
+        <dc:Bounds x="972" y="690" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_0lczgac_di" bpmnElement="ExclusiveGateway_0lczgac" isMarkerVisible="true">
-        <dc:Bounds x="901" y="843" width="50" height="50" />
+        <dc:Bounds x="402" y="833" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="901" y="818" width="49" height="12" />
+          <dc:Bounds x="402" y="808" width="49" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_0cdz77v_di" bpmnElement="ExclusiveGateway_0cdz77v" isMarkerVisible="true">
-        <dc:Bounds x="375" y="833" width="50" height="50" />
+        <dc:Bounds x="997" y="833" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="376" y="808" width="49" height="12" />
+          <dc:Bounds x="998" y="808" width="49" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_1xdjlzm_di" bpmnElement="ScriptTask_1xdjlzm">
         <dc:Bounds x="218" y="818" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0ofqw6v_di" bpmnElement="SequenceFlow_0ofqw6v">
-        <di:waypoint xsi:type="dc:Point" x="1022" y="632" />
-        <di:waypoint xsi:type="dc:Point" x="1022" y="694" />
+        <di:waypoint xsi:type="dc:Point" x="786" y="858" />
+        <di:waypoint xsi:type="dc:Point" x="673" y="859" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="992" y="657" width="90" height="12" />
+          <dc:Bounds x="684.5" y="837.5" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_15zgrcq_di" bpmnElement="SequenceFlow_15zgrcq">
-        <di:waypoint xsi:type="dc:Point" x="713" y="858" />
-        <di:waypoint xsi:type="dc:Point" x="617" y="858" />
+        <di:waypoint xsi:type="dc:Point" x="1022" y="644" />
+        <di:waypoint xsi:type="dc:Point" x="1022" y="690" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="620" y="837" width="90" height="12" />
+          <dc:Bounds x="992" y="661" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1vvdkcs_di" bpmnElement="SequenceFlow_1vvdkcs">
-        <di:waypoint xsi:type="dc:Point" x="1022" y="774" />
-        <di:waypoint xsi:type="dc:Point" x="1022" y="868" />
-        <di:waypoint xsi:type="dc:Point" x="951" y="868" />
+        <di:waypoint xsi:type="dc:Point" x="573" y="859" />
+        <di:waypoint xsi:type="dc:Point" x="452" y="858" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="992" y="815" width="90" height="12" />
+          <dc:Bounds x="467.5" y="837.5" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1x8vphc_di" bpmnElement="SequenceFlow_1x8vphc">
-        <di:waypoint xsi:type="dc:Point" x="517" y="858" />
-        <di:waypoint xsi:type="dc:Point" x="425" y="858" />
+        <di:waypoint xsi:type="dc:Point" x="1022" y="770" />
+        <di:waypoint xsi:type="dc:Point" x="1022" y="833" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="426" y="837" width="90" height="12" />
+          <dc:Bounds x="992" y="795.5" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1yv1kef_di" bpmnElement="SequenceFlow_1yv1kef">
-        <di:waypoint xsi:type="dc:Point" x="926" y="893" />
-        <di:waypoint xsi:type="dc:Point" x="926" y="997" />
+        <di:waypoint xsi:type="dc:Point" x="427" y="883" />
+        <di:waypoint xsi:type="dc:Point" x="427" y="962" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="919" y="992.0434782608695" width="14" height="12" />
+          <dc:Bounds x="455" y="892" width="14" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1d4wn2y_di" bpmnElement="SequenceFlow_1d4wn2y">
-        <di:waypoint xsi:type="dc:Point" x="901" y="868" />
-        <di:waypoint xsi:type="dc:Point" x="857" y="868" />
-        <di:waypoint xsi:type="dc:Point" x="857" y="868" />
-        <di:waypoint xsi:type="dc:Point" x="813" y="868" />
+        <di:waypoint xsi:type="dc:Point" x="402" y="858" />
+        <di:waypoint xsi:type="dc:Point" x="318" y="858" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="845.6658431603746" y="884.169830656822" width="18" height="12" />
+          <dc:Bounds x="823.2259872894327" y="883.5416267409498" width="18" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0ou0spo_di" bpmnElement="SequenceFlow_0ou0spo">
-        <di:waypoint xsi:type="dc:Point" x="400" y="883" />
-        <di:waypoint xsi:type="dc:Point" x="400" y="975" />
+        <di:waypoint xsi:type="dc:Point" x="1022" y="883" />
+        <di:waypoint xsi:type="dc:Point" x="1022" y="962" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="369.0759493670887" y="891.6808510638298" width="14" height="12" />
+          <dc:Bounds x="1045" y="895" width="14" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_092ghvu_di" bpmnElement="SequenceFlow_092ghvu">
@@ -468,31 +447,29 @@ csi.postConfigRequest(execution)]]></bpmn2:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0mcyg0e_di" bpmnElement="SequenceFlow_0mcyg0e">
-        <di:waypoint xsi:type="dc:Point" x="375" y="858" />
-        <di:waypoint xsi:type="dc:Point" x="353" y="858" />
-        <di:waypoint xsi:type="dc:Point" x="353" y="858" />
-        <di:waypoint xsi:type="dc:Point" x="318" y="858" />
+        <di:waypoint xsi:type="dc:Point" x="997" y="858" />
+        <di:waypoint xsi:type="dc:Point" x="886" y="858" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="368" y="852" width="0" height="12" />
+          <dc:Bounds x="896.5" y="837" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1170ztf_di" bpmnElement="SequenceFlow_1170ztf">
         <di:waypoint xsi:type="dc:Point" x="1022" y="510" />
-        <di:waypoint xsi:type="dc:Point" x="1022" y="552" />
+        <di:waypoint xsi:type="dc:Point" x="1022" y="564" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1037" y="525" width="0" height="12" />
+          <dc:Bounds x="992" y="531" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="EndEvent_0g2btws_di" bpmnElement="EndEvent_11lmyvs">
-        <dc:Bounds x="908" y="997" width="36" height="36" />
+        <dc:Bounds x="409" y="962" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="836" y="1036" width="0" height="12" />
+          <dc:Bounds x="292" y="1001" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_0y0wvdf_di" bpmnElement="EndEvent_01h4q8z">
-        <dc:Bounds x="382" y="975" width="36" height="36" />
+        <dc:Bounds x="1004" y="962" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="310" y="1014" width="0" height="12" />
+          <dc:Bounds x="887" y="1001" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_01p249c_di" bpmnElement="EndEvent_0kbbt94">
-- 
2.16.6