From 9fa22d016a6aa0d818831119c6bf2108449d9aba Mon Sep 17 00:00:00 2001
From: Alex <alexander.borovitzky@guest.telecomitalia.it>
Date: Mon, 23 Aug 2021 19:36:36 +0300
Subject: Changes in Modify and Deallocate Core NSSI flows

Issue-ID: SO-3703
Change-Id: I22391ae0ff142fd6923cb62621fb537708a3cd19
Signed-off-by: Alex <alexander.borovitzky@guest.telecomitalia.it>
---
 .../resources/subprocess/DoModifyCoreNSSI.bpmn     | 201 +++++++++++----------
 1 file changed, 108 insertions(+), 93 deletions(-)

(limited to 'bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoModifyCoreNSSI.bpmn')

diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoModifyCoreNSSI.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoModifyCoreNSSI.bpmn
index e0c0b9a994..80e154ca91 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoModifyCoreNSSI.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoModifyCoreNSSI.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_1ejx57e" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.1.1">
-  <bpmn:process id="Process_1nmtzzp" isExecutable="true">
+  <bpmn:process id="DoModifyCoreNSSI" name="DoModifyCoreNSSI" isExecutable="true">
     <bpmn:startEvent id="Event_0fbqt56" name="Modify Core NSSI Flow">
       <bpmn:outgoing>Flow_0e007rx</bpmn:outgoing>
     </bpmn:startEvent>
@@ -53,9 +53,6 @@ def mcnssi= new DoModifyCoreNSSI()
 def mcnssi= new DoModifyCoreNSSI()
         mcnssi.prepareUpdateResourceOperationStatus(execution)</bpmn:script>
     </bpmn:scriptTask>
-    <bpmn:endEvent id="Event_1p0mogo" name="End">
-      <bpmn:incoming>Flow_1yphs5r</bpmn:incoming>
-    </bpmn:endEvent>
     <bpmn:sequenceFlow id="Flow_0yq24um" sourceRef="Activity_0oph5am" targetRef="Activity_0d1kk7f" />
     <bpmn:intermediateCatchEvent id="Event_0z9mer1" name="Slice Profile Instance has to be created">
       <bpmn:outgoing>Flow_1twqfsc</bpmn:outgoing>
@@ -176,9 +173,8 @@ mcnssi.prepareFailedOperationStatusUpdate(execution)</bpmn:script>
         </camunda:connector>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_0yq24um</bpmn:incoming>
-      <bpmn:outgoing>Flow_1yphs5r</bpmn:outgoing>
+      <bpmn:outgoing>Flow_0yp03pi</bpmn:outgoing>
     </bpmn:serviceTask>
-    <bpmn:sequenceFlow id="Flow_1yphs5r" sourceRef="Activity_0d1kk7f" targetRef="Event_1p0mogo" />
     <bpmn:scriptTask id="Activity_0wdaul0" name="Calculate S-NSSAI" scriptFormat="groovy">
       <bpmn:incoming>Flow_0s31teg</bpmn:incoming>
       <bpmn:outgoing>Flow_0fj4doc</bpmn:outgoing>
@@ -222,9 +218,57 @@ mcnssi.timeDelay(execution)</bpmn:script>
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{(execution.getVariable("putStatus" ) == "processing" )}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="Flow_1twqfsc" sourceRef="Event_0z9mer1" targetRef="Activity_1q02wiz" />
+    <bpmn:scriptTask id="Activity_0rws6g3" name="PostProcess Incoming Request" scriptFormat="groovy">
+      <bpmn:incoming>Flow_0yp03pi</bpmn:incoming>
+      <bpmn:outgoing>Flow_0abxsbd</bpmn:outgoing>
+      <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
+def mcnssi= new DoModifyCoreNSSI()
+        mcnssi.postProcessRequest(execution)</bpmn:script>
+    </bpmn:scriptTask>
+    <bpmn:sequenceFlow id="Flow_0yp03pi" sourceRef="Activity_0d1kk7f" targetRef="Activity_0rws6g3" />
+    <bpmn:endEvent id="Event_0m863dd" name="Done">
+      <bpmn:incoming>Flow_0abxsbd</bpmn:incoming>
+    </bpmn:endEvent>
+    <bpmn:sequenceFlow id="Flow_0abxsbd" sourceRef="Activity_0rws6g3" targetRef="Event_0m863dd" />
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1nmtzzp">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoModifyCoreNSSI">
+      <bpmndi:BPMNEdge id="Flow_1twqfsc_di" bpmnElement="Flow_1twqfsc">
+        <di:waypoint x="248" y="430" />
+        <di:waypoint x="330" y="430" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_06or8oz_di" bpmnElement="Flow_06or8oz">
+        <di:waypoint x="1240" y="175" />
+        <di:waypoint x="1240" y="280" />
+        <di:waypoint x="1170" y="280" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1246" y="225" width="18" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1jm7045_di" bpmnElement="Flow_1jm7045">
+        <di:waypoint x="1120" y="240" />
+        <di:waypoint x="1120" y="190" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1hm2xps_di" bpmnElement="Flow_1hm2xps">
+        <di:waypoint x="1265" y="150" />
+        <di:waypoint x="1430" y="150" />
+        <di:waypoint x="1430" y="185" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1273" y="130" width="15" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0nxwq7b_di" bpmnElement="Flow_0nxwq7b">
+        <di:waypoint x="1170" y="150" />
+        <di:waypoint x="1215" y="150" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1y0m22h_di" bpmnElement="Flow_1y0m22h">
+        <di:waypoint x="1040" y="150" />
+        <di:waypoint x="1070" y="150" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0fj4doc_di" bpmnElement="Flow_0fj4doc">
+        <di:waypoint x="910" y="150" />
+        <di:waypoint x="940" y="150" />
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_06j2avj_di" bpmnElement="Flow_06j2avj">
         <di:waypoint x="360" y="150" />
         <di:waypoint x="400" y="150" />
@@ -285,45 +329,13 @@ mcnssi.timeDelay(execution)</bpmn:script>
         <di:waypoint x="500" y="150" />
         <di:waypoint x="540" y="150" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1yphs5r_di" bpmnElement="Flow_1yphs5r">
+      <bpmndi:BPMNEdge id="Flow_0yp03pi_di" bpmnElement="Flow_0yp03pi">
         <di:waypoint x="920" y="510" />
-        <di:waypoint x="962" y="510" />
+        <di:waypoint x="970" y="510" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0fj4doc_di" bpmnElement="Flow_0fj4doc">
-        <di:waypoint x="910" y="150" />
-        <di:waypoint x="940" y="150" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1y0m22h_di" bpmnElement="Flow_1y0m22h">
-        <di:waypoint x="1040" y="150" />
-        <di:waypoint x="1070" y="150" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0nxwq7b_di" bpmnElement="Flow_0nxwq7b">
-        <di:waypoint x="1170" y="150" />
-        <di:waypoint x="1215" y="150" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1hm2xps_di" bpmnElement="Flow_1hm2xps">
-        <di:waypoint x="1265" y="150" />
-        <di:waypoint x="1430" y="150" />
-        <di:waypoint x="1430" y="185" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1273" y="130" width="15" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1jm7045_di" bpmnElement="Flow_1jm7045">
-        <di:waypoint x="1120" y="240" />
-        <di:waypoint x="1120" y="190" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_06or8oz_di" bpmnElement="Flow_06or8oz">
-        <di:waypoint x="1240" y="175" />
-        <di:waypoint x="1240" y="280" />
-        <di:waypoint x="1170" y="280" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1246" y="225" width="18" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1twqfsc_di" bpmnElement="Flow_1twqfsc">
-        <di:waypoint x="248" y="430" />
-        <di:waypoint x="330" y="430" />
+      <bpmndi:BPMNEdge id="Flow_0abxsbd_di" bpmnElement="Flow_0abxsbd">
+        <di:waypoint x="1070" y="510" />
+        <di:waypoint x="1122" y="510" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="Event_0fbqt56_di" bpmnElement="Event_0fbqt56">
         <dc:Bounds x="182" y="132" width="36" height="36" />
@@ -331,9 +343,6 @@ mcnssi.timeDelay(execution)</bpmn:script>
           <dc:Bounds x="158" y="175" width="89" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0klj7y1_di" bpmnElement="Activity_0klj7y1">
-        <dc:Bounds x="260" y="110" width="100" height="80" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0tf735w_di" bpmnElement="Activity_0tf735w">
         <dc:Bounds x="400" y="110" width="100" height="80" />
       </bpmndi:BPMNShape>
@@ -343,19 +352,10 @@ mcnssi.timeDelay(execution)</bpmn:script>
       <bpmndi:BPMNShape id="Activity_02skgkj_di" bpmnElement="Activity_02skgkj">
         <dc:Bounds x="680" y="110" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0wdaul0_di" bpmnElement="Activity_0wdaul0">
-        <dc:Bounds x="810" y="110" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0rvt126_di" bpmnElement="Activity_0rvt126">
-        <dc:Bounds x="940" y="110" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1gojm1c_di" bpmnElement="Activity_1gojm1c">
-        <dc:Bounds x="1070" y="110" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Gateway_13w96z9_di" bpmnElement="Gateway_13w96z9" isMarkerVisible="true">
-        <dc:Bounds x="1215" y="125" width="50" height="50" />
+      <bpmndi:BPMNShape id="Gateway_1hadnun_di" bpmnElement="Gateway_1hadnun" isMarkerVisible="true">
+        <dc:Bounds x="1405" y="185" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1213" y="87" width="54" height="27" />
+          <dc:Bounds x="1305" y="190" width="90" height="40" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_1243wg1_di" bpmnElement="Event_1243wg1">
@@ -364,23 +364,14 @@ mcnssi.timeDelay(execution)</bpmn:script>
           <dc:Bounds x="1603" y="233" width="90" height="40" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Gateway_1hadnun_di" bpmnElement="Gateway_1hadnun" isMarkerVisible="true">
-        <dc:Bounds x="1405" y="185" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1305" y="190" width="90" height="40" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_1gjhrcq_di" bpmnElement="Event_1gjhrcq">
         <dc:Bounds x="1412" y="282" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1393" y="323" width="90" height="40" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_15kjs2a_di" bpmnElement="Activity_15kjs2a">
-        <dc:Bounds x="1070" y="240" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1q02wiz_di" bpmnElement="Activity_1q02wiz">
-        <dc:Bounds x="330" y="390" width="100" height="80" />
+      <bpmndi:BPMNShape id="Activity_0oph5am_di" bpmnElement="Activity_0oph5am">
+        <dc:Bounds x="660" y="470" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_0z9mer1_di" bpmnElement="Event_0z9mer1">
         <dc:Bounds x="212" y="412" width="36" height="36" />
@@ -388,51 +379,54 @@ mcnssi.timeDelay(execution)</bpmn:script>
           <dc:Bounds x="192" y="455" width="90" height="40" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0oph5am_di" bpmnElement="Activity_0oph5am">
-        <dc:Bounds x="660" y="470" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1iegufd_di" bpmnElement="Activity_1iegufd">
-        <dc:Bounds x="330" y="570" width="100" height="80" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_0m2jn7c_di" bpmnElement="Event_0m2jn7c">
         <dc:Bounds x="212" y="592" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="185" y="635" width="90" height="40" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_010nkjp_di" bpmnElement="Activity_010nkjp">
-        <dc:Bounds x="490" y="570" width="100" height="80" />
+      <bpmndi:BPMNShape id="Activity_1q02wiz_di" bpmnElement="Activity_1q02wiz">
+        <dc:Bounds x="330" y="390" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1josmor_di" bpmnElement="Activity_1josmor">
         <dc:Bounds x="480" y="390" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0d1kk7f_di" bpmnElement="Activity_0d1kk7f">
-        <dc:Bounds x="820" y="470" width="100" height="80" />
+      <bpmndi:BPMNShape id="Activity_1iegufd_di" bpmnElement="Activity_1iegufd">
+        <dc:Bounds x="330" y="570" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_010nkjp_di" bpmnElement="Activity_010nkjp">
+        <dc:Bounds x="490" y="570" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0klj7y1_di" bpmnElement="Activity_0klj7y1">
+        <dc:Bounds x="260" y="110" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_1p0mogo_di" bpmnElement="Event_1p0mogo">
-        <dc:Bounds x="962" y="492" width="36" height="36" />
+      <bpmndi:BPMNShape id="Activity_0rws6g3_di" bpmnElement="Activity_0rws6g3">
+        <dc:Bounds x="970" y="470" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_0m863dd_di" bpmnElement="Event_0m863dd">
+        <dc:Bounds x="1122" y="492" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="970" y="538" width="20" height="14" />
+          <dc:Bounds x="1127" y="535" width="27" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1u4xfuz_di" bpmnElement="Activity_1u4xfuz" isExpanded="true">
         <dc:Bounds x="190" y="790" width="781" height="196" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="Flow_07ftouz_di" bpmnElement="Flow_07ftouz">
-        <di:waypoint x="580" y="894" />
-        <di:waypoint x="650" y="894" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_14kgrjc_di" bpmnElement="Flow_14kgrjc">
-        <di:waypoint x="420" y="894" />
-        <di:waypoint x="480" y="894" />
+      <bpmndi:BPMNEdge id="Flow_00tfsrn_di" bpmnElement="Flow_00tfsrn">
+        <di:waypoint x="750" y="894" />
+        <di:waypoint x="858" y="894" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1i9kph3_di" bpmnElement="Flow_1i9kph3">
         <di:waypoint x="256" y="894" />
         <di:waypoint x="320" y="894" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_00tfsrn_di" bpmnElement="Flow_00tfsrn">
-        <di:waypoint x="750" y="894" />
-        <di:waypoint x="858" y="894" />
+      <bpmndi:BPMNEdge id="Flow_14kgrjc_di" bpmnElement="Flow_14kgrjc">
+        <di:waypoint x="420" y="894" />
+        <di:waypoint x="480" y="894" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_07ftouz_di" bpmnElement="Flow_07ftouz">
+        <di:waypoint x="580" y="894" />
+        <di:waypoint x="650" y="894" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="Event_0xhp6c7_di" bpmnElement="Event_0xhp6c7">
         <dc:Bounds x="220" y="876" width="36" height="36" />
@@ -449,6 +443,27 @@ mcnssi.timeDelay(execution)</bpmn:script>
       <bpmndi:BPMNShape id="Activity_1feavwd_di" bpmnElement="Activity_1feavwd">
         <dc:Bounds x="480" y="854" width="100" height="80" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0d1kk7f_di" bpmnElement="Activity_0d1kk7f">
+        <dc:Bounds x="820" y="470" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0wdaul0_di" bpmnElement="Activity_0wdaul0">
+        <dc:Bounds x="810" y="110" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0rvt126_di" bpmnElement="Activity_0rvt126">
+        <dc:Bounds x="940" y="110" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1gojm1c_di" bpmnElement="Activity_1gojm1c">
+        <dc:Bounds x="1070" y="110" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_13w96z9_di" bpmnElement="Gateway_13w96z9" isMarkerVisible="true">
+        <dc:Bounds x="1215" y="125" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1213" y="87" width="54" height="27" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_15kjs2a_di" bpmnElement="Activity_15kjs2a">
+        <dc:Bounds x="1070" y="240" width="100" height="80" />
+      </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn:definitions>
-- 
cgit 1.2.3-korg